From 3e440f3500e0e2b992cb4c242851c591b47d4f4d Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Mon, 27 Nov 2017 13:56:03 -0800 Subject: [PATCH 01/12] Add MobileLog support --- include/grpc/impl/codegen/grpc_types.h | 1 + .../GRPCClient/GRPCCall+MobileLog.h | 26 +++++++++++++++ .../GRPCClient/GRPCCall+MobileLog.m | 33 +++++++++++++++++++ .../GRPCClient/private/GRPCChannel.m | 22 +++++++++++++ src/objective-c/GRPCClient/private/GRPCHost.m | 6 ++++ 5 files changed, 88 insertions(+) create mode 100644 src/objective-c/GRPCClient/GRPCCall+MobileLog.h create mode 100644 src/objective-c/GRPCClient/GRPCCall+MobileLog.m diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index d64b23f332d..85106cad106 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -309,6 +309,7 @@ typedef struct { Defaults to "blend". In the current implementation "blend" is equivalent to "latency". */ #define GRPC_ARG_OPTIMIZATION_TARGET "grpc.optimization_target" +#define GRPC_ARG_MOBILE_LOG_CONFIG "grpc.mobile_log_config" /** \} */ /** Result of a grpc call. If the caller satisfies the prerequisites of a diff --git a/src/objective-c/GRPCClient/GRPCCall+MobileLog.h b/src/objective-c/GRPCClient/GRPCCall+MobileLog.h new file mode 100644 index 00000000000..7ccc1400840 --- /dev/null +++ b/src/objective-c/GRPCClient/GRPCCall+MobileLog.h @@ -0,0 +1,26 @@ +/* + * + * 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. + * + */ + +// Set the log config object to be passed to channels as channel arg. +// The setting is only effective to channels created after setLogConfig. +#import "GRPCCall.h" + +@interface GRPCCall (MobileLog) ++ (void)setLogConfig:(id)logConfig; ++ (id)logConfig; +@end diff --git a/src/objective-c/GRPCClient/GRPCCall+MobileLog.m b/src/objective-c/GRPCClient/GRPCCall+MobileLog.m new file mode 100644 index 00000000000..4dedb7de8bb --- /dev/null +++ b/src/objective-c/GRPCClient/GRPCCall+MobileLog.m @@ -0,0 +1,33 @@ +/* + * + * 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. + * + */ + +#import "GRPCCall+MobileLog.h" + +static id globalLogConfig = nil; + +@implementation GRPCCall (MobileLog) + ++ (void)setLogConfig:(id)logConfig { + globalLogConfig = logConfig; +} + ++ (id)logConfig { + return globalLogConfig; +} + +@end diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.m b/src/objective-c/GRPCClient/private/GRPCChannel.m index 26efe90abd7..a5544bf6e7e 100644 --- a/src/objective-c/GRPCClient/private/GRPCChannel.m +++ b/src/objective-c/GRPCClient/private/GRPCChannel.m @@ -32,6 +32,24 @@ #endif #import "GRPCCompletionQueue.h" +static void* copy_pointer_arg(void *p) { + // Add ref count to the object when making copy + id obj = (__bridge id)p; + return (__bridge_retained void *)obj; +} + +static void destroy_pointer_arg(void *p) { + // Decrease ref count to the object when destroying + CFRelease((CFTreeRef)p); +} + +static int cmp_pointer_arg(void *p, void *q) { + return p == q; +} + +static const grpc_arg_pointer_vtable objc_arg_vtable = { + copy_pointer_arg, destroy_pointer_arg, cmp_pointer_arg}; + static void FreeChannelArgs(grpc_channel_args *channel_args) { for (size_t i = 0; i < channel_args->num_args; ++i) { grpc_arg *arg = &channel_args->args[i]; @@ -75,6 +93,10 @@ static grpc_channel_args *BuildChannelArgs(NSDictionary *dictionary) { } else if ([value respondsToSelector:@selector(intValue)]) { arg->type = GRPC_ARG_INTEGER; arg->value.integer = [value intValue]; + } else if (value != nil) { + arg->type = GRPC_ARG_POINTER; + arg->value.pointer.p = (__bridge_retained void *)value; + arg->value.pointer.vtable = &objc_arg_vtable; } else { [NSException raise:NSInvalidArgumentException format:@"Invalid value type: %@", [value class]]; diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m index ceae9607d78..71b57cf1f67 100644 --- a/src/objective-c/GRPCClient/private/GRPCHost.m +++ b/src/objective-c/GRPCClient/private/GRPCHost.m @@ -21,6 +21,7 @@ #include #include #import +#import #ifdef GRPC_COMPILE_WITH_CRONET #import #import @@ -231,6 +232,11 @@ static GRPCConnectivityMonitor *connectivityMonitor = nil; [NSNumber numberWithInt:_compressAlgorithm]; } + id logConfig = [GRPCCall logConfig]; + if (logConfig != nil) { + args[@GRPC_ARG_MOBILE_LOG_CONFIG] = logConfig; + } + return args; } From bd0f15119a3563d16869262d4c38a419264799ec Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 20 Feb 2018 10:28:22 -0800 Subject: [PATCH 02/12] Refactor code for generating balancer channel args. --- .../client_channel/lb_policy/grpclb/grpclb.cc | 115 ++++++++------- .../lb_policy/grpclb/grpclb_channel.cc | 52 +------ .../lb_policy/grpclb/grpclb_channel.h | 24 +--- .../lb_policy/grpclb/grpclb_channel_secure.cc | 133 ++++++++++-------- test/cpp/end2end/grpclb_end2end_test.cc | 2 + 5 files changed, 146 insertions(+), 180 deletions(-) diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 11163a56dc9..e38211fbf43 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -918,34 +918,8 @@ void GrpcLb::BalancerCallState::OnBalancerStatusReceivedLocked( // helper code for creating balancer channel // -// Helper function to construct a target info entry. -grpc_slice_hash_table_entry BalancerEntryCreate(const char* address, - const char* balancer_name) { - grpc_slice_hash_table_entry entry; - entry.key = grpc_slice_from_copied_string(address); - entry.value = gpr_strdup(balancer_name); - return entry; -} - -// Comparison function used for slice_hash_table vtable. -int BalancerNameCmp(void* a, void* b) { - const char* a_str = static_cast(a); - const char* b_str = static_cast(b); - return strcmp(a_str, b_str); -} - -/* Returns the channel args for the LB channel, used to create a bidirectional - * stream for the reception of load balancing updates. - * - * Inputs: - * - \a addresses: corresponding to the balancers. - * - \a response_generator: in order to propagate updates from the resolver - * above the grpclb policy. - * - \a args: other args inherited from the grpclb policy. */ -grpc_channel_args* BuildBalancerChannelArgs( - const grpc_lb_addresses* addresses, - FakeResolverResponseGenerator* response_generator, - const grpc_channel_args* args) { +grpc_lb_addresses* ExtractBalancerAddresses( + const grpc_lb_addresses* addresses) { size_t num_grpclb_addrs = 0; for (size_t i = 0; i < addresses->num_addresses; ++i) { if (addresses->addresses[i].is_balancer) ++num_grpclb_addrs; @@ -955,9 +929,6 @@ grpc_channel_args* BuildBalancerChannelArgs( GPR_ASSERT(num_grpclb_addrs > 0); grpc_lb_addresses* lb_addresses = grpc_lb_addresses_create(num_grpclb_addrs, nullptr); - grpc_slice_hash_table_entry* targets_info_entries = - (grpc_slice_hash_table_entry*)gpr_zalloc(sizeof(*targets_info_entries) * - num_grpclb_addrs); size_t lb_addresses_idx = 0; for (size_t i = 0; i < addresses->num_addresses; ++i) { if (!addresses->addresses[i].is_balancer) continue; @@ -965,32 +936,71 @@ grpc_channel_args* BuildBalancerChannelArgs( gpr_log(GPR_ERROR, "This LB policy doesn't support user data. It will be ignored"); } - char* addr_str; - GPR_ASSERT(grpc_sockaddr_to_string( - &addr_str, &addresses->addresses[i].address, true) > 0); - targets_info_entries[lb_addresses_idx] = - BalancerEntryCreate(addr_str, addresses->addresses[i].balancer_name); - gpr_free(addr_str); grpc_lb_addresses_set_address( lb_addresses, lb_addresses_idx++, addresses->addresses[i].address.addr, addresses->addresses[i].address.len, false /* is balancer */, addresses->addresses[i].balancer_name, nullptr /* user data */); } GPR_ASSERT(num_grpclb_addrs == lb_addresses_idx); - grpc_slice_hash_table* targets_info = grpc_slice_hash_table_create( - num_grpclb_addrs, targets_info_entries, gpr_free, BalancerNameCmp); - gpr_free(targets_info_entries); - grpc_channel_args* lb_channel_args = - grpc_lb_policy_grpclb_build_lb_channel_args(targets_info, - response_generator, args); - grpc_arg lb_channel_addresses_arg = - grpc_lb_addresses_create_channel_arg(lb_addresses); - grpc_channel_args* result = grpc_channel_args_copy_and_add( - lb_channel_args, &lb_channel_addresses_arg, 1); - grpc_slice_hash_table_unref(targets_info); - grpc_channel_args_destroy(lb_channel_args); + return lb_addresses; +} + +/* Returns the channel args for the LB channel, used to create a bidirectional + * stream for the reception of load balancing updates. + * + * Inputs: + * - \a addresses: corresponding to the balancers. + * - \a response_generator: in order to propagate updates from the resolver + * above the grpclb policy. + * - \a args: other args inherited from the grpclb policy. */ +grpc_channel_args* BuildBalancerChannelArgs( + const grpc_lb_addresses* addresses, + FakeResolverResponseGenerator* response_generator, + const grpc_channel_args* args) { + grpc_lb_addresses* lb_addresses = ExtractBalancerAddresses(addresses); + // Channel args to remove. + static const char* args_to_remove[] = { + // LB policy name, since we want to use the default (pick_first) in + // the LB channel. + GRPC_ARG_LB_POLICY_NAME, + // The channel arg for the server URI, since that will be different for + // the LB channel than for the parent channel. The client channel + // factory will re-add this arg with the right value. + GRPC_ARG_SERVER_URI, + // The resolved addresses, which will be generated by the name resolver + // used in the LB channel. Note that the LB channel will use the fake + // resolver, so this won't actually generate a query to DNS (or some + // other name service). However, the addresses returned by the fake + // resolver will have is_balancer=false, whereas our own addresses have + // is_balancer=true. We need the LB channel to return addresses with + // is_balancer=false so that it does not wind up recursively using the + // grpclb LB policy, as per the special case logic in client_channel.c. + GRPC_ARG_LB_ADDRESSES, + // The fake resolver response generator, because we are replacing it + // with the one from the grpclb policy, used to propagate updates to + // the LB channel. + GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR, + }; + // Channel args to add. + const grpc_arg args_to_add[] = { + // New LB addresses. + // Note that we pass these in both when creating the LB channel + // and via the fake resolver. The latter is what actually gets used. + grpc_lb_addresses_create_channel_arg(lb_addresses), + // The fake resolver response generator, which we use to inject + // address updates into the LB channel. + grpc_core::FakeResolverResponseGenerator::MakeChannelArg( + response_generator), + }; + // Construct channel args. + grpc_channel_args* new_args = grpc_channel_args_copy_and_add_and_remove( + args, args_to_remove, GPR_ARRAY_SIZE(args_to_remove), args_to_add, + GPR_ARRAY_SIZE(args_to_add)); + // Make any necessary modifications for security. + new_args = grpc_lb_policy_grpclb_modify_lb_channel_args(new_args); + // Clean up. grpc_lb_addresses_destroy(lb_addresses); - return result; + return new_args; } // @@ -1292,8 +1302,9 @@ void GrpcLb::ProcessChannelArgsLocked(const grpc_channel_args& args) { if (lb_channel_ == nullptr) { char* uri_str; gpr_asprintf(&uri_str, "fake:///%s", server_name_); - lb_channel_ = grpc_lb_policy_grpclb_create_lb_channel( - uri_str, client_channel_factory(), lb_channel_args); + lb_channel_ = grpc_client_channel_factory_create_channel( + client_channel_factory(), uri_str, + GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, lb_channel_args); GPR_ASSERT(lb_channel_ != nullptr); gpr_free(uri_str); } diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc index 013fb12aea7..ebbe597d29e 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc @@ -16,57 +16,9 @@ * */ -#include -#include - -#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" -#include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" -grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( - const char* lb_service_target_addresses, - grpc_client_channel_factory* client_channel_factory, +grpc_channel_args* grpc_lb_policy_grpclb_modify_lb_channel_args( grpc_channel_args* args) { - grpc_channel* lb_channel = grpc_client_channel_factory_create_channel( - client_channel_factory, lb_service_target_addresses, - GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, args); - return lb_channel; -} - -grpc_channel_args* grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_slice_hash_table* targets_info, - grpc_core::FakeResolverResponseGenerator* response_generator, - const grpc_channel_args* args) { - const grpc_arg to_add[] = { - grpc_core::FakeResolverResponseGenerator::MakeChannelArg( - response_generator)}; - /* We remove: - * - * - The channel arg for the LB policy name, since we want to use the default - * (pick_first) in this case. - * - * - The channel arg for the resolved addresses, since that will be generated - * by the name resolver used in the LB channel. Note that the LB channel - * will use the fake resolver, so this won't actually generate a query - * to DNS (or some other name service). However, the addresses returned by - * the fake resolver will have is_balancer=false, whereas our own - * addresses have is_balancer=true. We need the LB channel to return - * addresses with is_balancer=false so that it does not wind up recursively - * using the grpclb LB policy, as per the special case logic in - * client_channel.c. - * - * - The channel arg for the server URI, since that will be different for the - * LB channel than for the parent channel (the client channel factory will - * re-add this arg with the right value). - * - * - The fake resolver generator, because we are replacing it with the one - * from the grpclb policy, used to propagate updates to the LB channel. */ - static const char* keys_to_remove[] = { - GRPC_ARG_LB_POLICY_NAME, GRPC_ARG_LB_ADDRESSES, GRPC_ARG_SERVER_URI, - GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR}; - return grpc_channel_args_copy_and_add_and_remove( - args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), to_add, - GPR_ARRAY_SIZE(to_add)); + return args; } diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h index 2e34e3cab52..6635010434c 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h @@ -20,25 +20,15 @@ #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_CHANNEL_H #include "src/core/ext/filters/client_channel/lb_policy_factory.h" -#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" -#include "src/core/lib/slice/slice_hash_table.h" -/** Create the channel used for communicating with an LB service. - * Note that an LB *service* may be comprised of several LB *servers*. - * - * \a lb_service_target_addresses is the target URI containing the addresses - * from resolving the LB service's name (eg, ipv4:10.0.0.1:1234,10.2.3.4:9876). - * \a client_channel_factory will be used for the creation of the LB channel, - * alongside the channel args passed in \a args. */ -grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( - const char* lb_service_target_addresses, - grpc_client_channel_factory* client_channel_factory, +/// Makes any necessary modifications to \a args for use in the grpclb +/// balancer channel. +/// +/// Takes ownership of \a args. +/// +/// Caller takes ownership of the returned args. +grpc_channel_args* grpc_lb_policy_grpclb_modify_lb_channel_args( grpc_channel_args* args); -grpc_channel_args* grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_slice_hash_table* targets_info, - grpc_core::FakeResolverResponseGenerator* response_generator, - const grpc_channel_args* args); - #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_CHANNEL_H \ */ diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc index 5e615addbfe..254a5dfd16d 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc @@ -16,11 +16,14 @@ * */ +#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" + +#include + #include #include #include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/sockaddr_utils.h" @@ -28,73 +31,81 @@ #include "src/core/lib/security/transport/lb_targets_info.h" #include "src/core/lib/slice/slice_internal.h" -grpc_channel* grpc_lb_policy_grpclb_create_lb_channel( - const char* lb_service_target_addresses, - grpc_client_channel_factory* client_channel_factory, +static void destroy_balancer_name(void* balancer_name) { + gpr_free(balancer_name); +} + +static grpc_slice_hash_table_entry targets_info_entry_create( + const char* address, const char* balancer_name) { + grpc_slice_hash_table_entry entry; + entry.key = grpc_slice_from_copied_string(address); + entry.value = gpr_strdup(balancer_name); + return entry; +} + +static int balancer_name_cmp_fn(void* a, void* b) { + const char* a_str = static_cast(a); + const char* b_str = static_cast(b); + return strcmp(a_str, b_str); +} + +static grpc_slice_hash_table* build_targets_info_table( + grpc_lb_addresses* addresses) { + grpc_slice_hash_table_entry* targets_info_entries = + static_cast( + gpr_zalloc(sizeof(*targets_info_entries) * addresses->num_addresses)); + for (size_t i = 0; i < addresses->num_addresses; ++i) { + char* addr_str; + GPR_ASSERT(grpc_sockaddr_to_string( + &addr_str, &addresses->addresses[i].address, true) > 0); + targets_info_entries[i] = targets_info_entry_create( + addr_str, addresses->addresses[i].balancer_name); + gpr_free(addr_str); + } + grpc_slice_hash_table* targets_info = grpc_slice_hash_table_create( + addresses->num_addresses, targets_info_entries, destroy_balancer_name, + balancer_name_cmp_fn); + gpr_free(targets_info_entries); + return targets_info; +} + +grpc_channel_args* grpc_lb_policy_grpclb_modify_lb_channel_args( grpc_channel_args* args) { - grpc_channel_args* new_args = args; + const char* args_to_remove[1]; + size_t num_args_to_remove = 0; + grpc_arg args_to_add[2]; + size_t num_args_to_add = 0; + // Add arg for targets info table. + const grpc_arg* arg = grpc_channel_args_find(args, GRPC_ARG_LB_ADDRESSES); + GPR_ASSERT(arg != nullptr); + GPR_ASSERT(arg->type == GRPC_ARG_POINTER); + grpc_lb_addresses* addresses = + static_cast(arg->value.pointer.p); + grpc_slice_hash_table* targets_info = build_targets_info_table(addresses); + args_to_add[num_args_to_add++] = + grpc_lb_targets_info_create_channel_arg(targets_info); + // Substitute the channel credentials with a version without call + // credentials: the load balancer is not necessarily trusted to handle + // bearer token credentials. grpc_channel_credentials* channel_credentials = grpc_channel_credentials_find_in_args(args); + grpc_channel_credentials* creds_sans_call_creds = nullptr; if (channel_credentials != nullptr) { - /* Substitute the channel credentials with a version without call - * credentials: the load balancer is not necessarily trusted to handle - * bearer token credentials */ - static const char* keys_to_remove[] = {GRPC_ARG_CHANNEL_CREDENTIALS}; - grpc_channel_credentials* creds_sans_call_creds = + creds_sans_call_creds = grpc_channel_credentials_duplicate_without_call_credentials( channel_credentials); GPR_ASSERT(creds_sans_call_creds != nullptr); - grpc_arg args_to_add[] = { - grpc_channel_credentials_to_arg(creds_sans_call_creds)}; - /* Create the new set of channel args */ - new_args = grpc_channel_args_copy_and_add_and_remove( - args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), args_to_add, - GPR_ARRAY_SIZE(args_to_add)); - grpc_channel_credentials_unref(creds_sans_call_creds); + args_to_remove[num_args_to_remove++] = GRPC_ARG_CHANNEL_CREDENTIALS; + args_to_add[num_args_to_add++] = + grpc_channel_credentials_to_arg(creds_sans_call_creds); } - grpc_channel* lb_channel = grpc_client_channel_factory_create_channel( - client_channel_factory, lb_service_target_addresses, - GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, new_args); - if (channel_credentials != nullptr) { - grpc_channel_args_destroy(new_args); + grpc_channel_args* result = grpc_channel_args_copy_and_add_and_remove( + args, args_to_remove, num_args_to_remove, args_to_add, num_args_to_add); + // Clean up. + grpc_channel_args_destroy(args); + grpc_slice_hash_table_unref(targets_info); + if (creds_sans_call_creds != nullptr) { + grpc_channel_credentials_unref(creds_sans_call_creds); } - return lb_channel; -} - -grpc_channel_args* grpc_lb_policy_grpclb_build_lb_channel_args( - grpc_slice_hash_table* targets_info, - grpc_core::FakeResolverResponseGenerator* response_generator, - const grpc_channel_args* args) { - const grpc_arg to_add[] = { - grpc_lb_targets_info_create_channel_arg(targets_info), - grpc_core::FakeResolverResponseGenerator::MakeChannelArg( - response_generator)}; - /* We remove: - * - * - The channel arg for the LB policy name, since we want to use the default - * (pick_first) in this case. - * - * - The channel arg for the resolved addresses, since that will be generated - * by the name resolver used in the LB channel. Note that the LB channel - * will use the fake resolver, so this won't actually generate a query - * to DNS (or some other name service). However, the addresses returned by - * the fake resolver will have is_balancer=false, whereas our own - * addresses have is_balancer=true. We need the LB channel to return - * addresses with is_balancer=false so that it does not wind up recursively - * using the grpclb LB policy, as per the special case logic in - * client_channel.c. - * - * - The channel arg for the server URI, since that will be different for the - * LB channel than for the parent channel (the client channel factory will - * re-add this arg with the right value). - * - * - The fake resolver generator, because we are replacing it with the one - * from the grpclb policy, used to propagate updates to the LB channel. */ - static const char* keys_to_remove[] = { - GRPC_ARG_LB_POLICY_NAME, GRPC_ARG_LB_ADDRESSES, GRPC_ARG_SERVER_URI, - GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR}; - /* Add the targets info table to be used for secure naming */ - return grpc_channel_args_copy_and_add_and_remove( - args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), to_add, - GPR_ARRAY_SIZE(to_add)); + return result; } diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 96bd93682e3..25e108e1a18 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -58,6 +58,8 @@ // - Test handling of creation of faulty RR instance by having the LB return a // serverlist with non-existent backends after having initially returned a // valid one. +// - test using secure credentials and make sure we don't send call +// credentials to the balancer // // Findings from end to end testing to be covered here: // - Handling of LB servers restart, including reconnection after backing-off From d9cab8443c24bce2d11b31d236df109d29675f27 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Thu, 22 Feb 2018 10:52:15 -0800 Subject: [PATCH 03/12] Bump version to 1.10.0-pre1 --- BUILD | 4 ++-- build.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILD b/BUILD index 1d5b0216526..b3a51987cdf 100644 --- a/BUILD +++ b/BUILD @@ -66,9 +66,9 @@ config_setting( # This should be updated along with build.yaml g_stands_for = "glamorous" -core_version = "6.0.0-dev" +core_version = "6.0.0-pre1" -version = "1.10.0-dev" +version = "1.10.0-pre1" GPR_PUBLIC_HDRS = [ "include/grpc/support/alloc.h", diff --git a/build.yaml b/build.yaml index b20eba99749..63829e246f3 100644 --- a/build.yaml +++ b/build.yaml @@ -12,9 +12,9 @@ settings: '#08': Use "-preN" suffixes to identify pre-release versions '#09': Per-language overrides are possible with (eg) ruby_version tag here '#10': See the expand_version.py for all the quirks here - core_version: 6.0.0-dev + core_version: 6.0.0-pre1 g_stands_for: glamorous - version: 1.10.0-dev + version: 1.10.0-pre1 filegroups: - name: census public_headers: From 005d63da4c9c7bf4647a1e453e795ec4f9be8ff6 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Thu, 22 Feb 2018 10:53:01 -0800 Subject: [PATCH 04/12] Regenerate projects --- CMakeLists.txt | 2 +- Makefile | 6 +++--- gRPC-C++.podspec | 4 ++-- gRPC-Core.podspec | 2 +- gRPC-ProtoRPC.podspec | 2 +- gRPC-RxLibrary.podspec | 2 +- gRPC.podspec | 2 +- package.xml | 4 ++-- src/core/lib/surface/version.cc | 2 +- src/cpp/common/version_cc.cc | 2 +- src/csharp/Grpc.Core/Version.csproj.include | 2 +- src/csharp/Grpc.Core/VersionInfo.cs | 2 +- src/csharp/build_packages_dotnetcli.bat | 2 +- src/csharp/build_packages_dotnetcli.sh | 4 ++-- src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 2 +- src/objective-c/GRPCClient/private/version.h | 2 +- src/objective-c/tests/version.h | 4 ++-- src/php/ext/grpc/version.h | 2 +- src/python/grpcio/grpc/_grpcio_metadata.py | 2 +- src/python/grpcio/grpc_version.py | 2 +- src/python/grpcio_health_checking/grpc_version.py | 2 +- src/python/grpcio_reflection/grpc_version.py | 2 +- src/python/grpcio_testing/grpc_version.py | 2 +- src/python/grpcio_tests/grpc_version.py | 2 +- src/ruby/lib/grpc/version.rb | 2 +- src/ruby/tools/version.rb | 2 +- tools/distrib/python/grpcio_tools/grpc_version.py | 2 +- tools/doxygen/Doxyfile.c++ | 2 +- tools/doxygen/Doxyfile.c++.internal | 2 +- tools/doxygen/Doxyfile.core | 2 +- tools/doxygen/Doxyfile.core.internal | 2 +- 31 files changed, 37 insertions(+), 37 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64a7dc7890e..f0789b3f690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 2.8) set(PACKAGE_NAME "grpc") -set(PACKAGE_VERSION "1.10.0-dev") +set(PACKAGE_VERSION "1.10.0-pre1") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") diff --git a/Makefile b/Makefile index ba6c51a7ceb..0971eed83ff 100644 --- a/Makefile +++ b/Makefile @@ -418,9 +418,9 @@ E = @echo Q = @ endif -CORE_VERSION = 6.0.0-dev -CPP_VERSION = 1.10.0-dev -CSHARP_VERSION = 1.10.0-dev +CORE_VERSION = 6.0.0-pre1 +CPP_VERSION = 1.10.0-pre1 +CSHARP_VERSION = 1.10.0-pre1 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 64029fb1f75..f720cafd27f 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-C++' # TODO (mxyan): use version that match gRPC version when pod is stabilized - # version = '1.10.0-dev' + # version = '1.10.0-pre1' version = '0.0.1' s.version = version s.summary = 'gRPC C++ library' @@ -31,7 +31,7 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - grpc_version = '1.10.0-dev' + grpc_version = '1.10.0-pre1' s.source = { :git => 'https://github.com/grpc/grpc.git', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 45a9815edd6..21bc9991250 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.10.0-dev' + version = '1.10.0-pre1' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'https://grpc.io' diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index a0375bd0b83..2aaadd2fd73 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.10.0-dev' + version = '1.10.0-pre1' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'https://grpc.io' diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index 280aafefb6e..9e7754d9ad5 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-RxLibrary' - version = '1.10.0-dev' + version = '1.10.0-pre1' s.version = version s.summary = 'Reactive Extensions library for iOS/OSX.' s.homepage = 'https://grpc.io' diff --git a/gRPC.podspec b/gRPC.podspec index 930d991a6c4..52b76aad228 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '1.10.0-dev' + version = '1.10.0-pre1' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'https://grpc.io' diff --git a/package.xml b/package.xml index 788161a4a14..f847a65446b 100644 --- a/package.xml +++ b/package.xml @@ -13,8 +13,8 @@ 2018-01-19 - 1.10.0dev - 1.10.0dev + 1.10.0RC1 + 1.10.0RC1 beta diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc index 51daad0368f..5f55cf67feb 100644 --- a/src/core/lib/surface/version.cc +++ b/src/core/lib/surface/version.cc @@ -21,6 +21,6 @@ #include -const char* grpc_version_string(void) { return "6.0.0-dev"; } +const char* grpc_version_string(void) { return "6.0.0-pre1"; } const char* grpc_g_stands_for(void) { return "glamorous"; } diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc index 4ca6afd43f2..59e341d684c 100644 --- a/src/cpp/common/version_cc.cc +++ b/src/cpp/common/version_cc.cc @@ -22,5 +22,5 @@ #include namespace grpc { -grpc::string Version() { return "1.10.0-dev"; } +grpc::string Version() { return "1.10.0-pre1"; } } // namespace grpc diff --git a/src/csharp/Grpc.Core/Version.csproj.include b/src/csharp/Grpc.Core/Version.csproj.include index 539d3a9f801..02ee22f05c1 100755 --- a/src/csharp/Grpc.Core/Version.csproj.include +++ b/src/csharp/Grpc.Core/Version.csproj.include @@ -1,7 +1,7 @@ - 1.10.0-dev + 1.10.0-pre1 3.3.0 diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index f1aef46c6cb..6694fde149d 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -38,6 +38,6 @@ namespace Grpc.Core /// /// Current version of gRPC C# /// - public const string CurrentVersion = "1.10.0-dev"; + public const string CurrentVersion = "1.10.0-pre1"; } } diff --git a/src/csharp/build_packages_dotnetcli.bat b/src/csharp/build_packages_dotnetcli.bat index 4087d8b67a6..83d58dafece 100755 --- a/src/csharp/build_packages_dotnetcli.bat +++ b/src/csharp/build_packages_dotnetcli.bat @@ -13,7 +13,7 @@ @rem limitations under the License. @rem Current package versions -set VERSION=1.10.0-dev +set VERSION=1.10.0-pre1 @rem Adjust the location of nuget.exe set NUGET=C:\nuget\nuget.exe diff --git a/src/csharp/build_packages_dotnetcli.sh b/src/csharp/build_packages_dotnetcli.sh index 8ccc537a609..c035d996144 100755 --- a/src/csharp/build_packages_dotnetcli.sh +++ b/src/csharp/build_packages_dotnetcli.sh @@ -39,7 +39,7 @@ dotnet pack --configuration Release Grpc.Auth --output ../../../artifacts dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts -nuget pack Grpc.nuspec -Version "1.10.0-dev" -OutputDirectory ../../artifacts -nuget pack Grpc.Tools.nuspec -Version "1.10.0-dev" -OutputDirectory ../../artifacts +nuget pack Grpc.nuspec -Version "1.10.0-pre1" -OutputDirectory ../../artifacts +nuget pack Grpc.Tools.nuspec -Version "1.10.0-pre1" -OutputDirectory ../../artifacts (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg) diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 037ad4d9b0e..2cecb0b1ae0 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -42,7 +42,7 @@ Pod::Spec.new do |s| # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # before them. s.name = '!ProtoCompiler-gRPCPlugin' - v = '1.10.0-dev' + v = '1.10.0-pre1' s.version = v s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.description = <<-DESC diff --git a/src/objective-c/GRPCClient/private/version.h b/src/objective-c/GRPCClient/private/version.h index 5c134e36420..53726717f83 100644 --- a/src/objective-c/GRPCClient/private/version.h +++ b/src/objective-c/GRPCClient/private/version.h @@ -23,4 +23,4 @@ // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.10.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.10.0-pre1" diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h index 5140aa23a67..c9c1df1d0f3 100644 --- a/src/objective-c/tests/version.h +++ b/src/objective-c/tests/version.h @@ -23,5 +23,5 @@ // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.10.0-dev" -#define GRPC_C_VERSION_STRING @"6.0.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.10.0-pre1" +#define GRPC_C_VERSION_STRING @"6.0.0-pre1" diff --git a/src/php/ext/grpc/version.h b/src/php/ext/grpc/version.h index 408f2a47656..a75de726d3f 100644 --- a/src/php/ext/grpc/version.h +++ b/src/php/ext/grpc/version.h @@ -20,6 +20,6 @@ #ifndef VERSION_H #define VERSION_H -#define PHP_GRPC_VERSION "1.10.0dev" +#define PHP_GRPC_VERSION "1.10.0RC1" #endif /* VERSION_H */ diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py index 6032828c776..6df68755217 100644 --- a/src/python/grpcio/grpc/_grpcio_metadata.py +++ b/src/python/grpcio/grpc/_grpcio_metadata.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!! -__version__ = """1.10.0.dev0""" +__version__ = """1.10.0rc1""" diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py index a654eb026a7..cd20bc94dfd 100644 --- a/src/python/grpcio/grpc_version.py +++ b/src/python/grpcio/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.10.0rc1' diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py index d3185c69725..3cc5ca8094a 100644 --- a/src/python/grpcio_health_checking/grpc_version.py +++ b/src/python/grpcio_health_checking/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.10.0rc1' diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py index 7203d0d3213..58854c1517b 100644 --- a/src/python/grpcio_reflection/grpc_version.py +++ b/src/python/grpcio_reflection/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.10.0rc1' diff --git a/src/python/grpcio_testing/grpc_version.py b/src/python/grpcio_testing/grpc_version.py index bf9e55e10e2..dadf6a25e7a 100644 --- a/src/python/grpcio_testing/grpc_version.py +++ b/src/python/grpcio_testing/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.10.0rc1' diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py index 2583e420160..d0081708cf5 100644 --- a/src/python/grpcio_tests/grpc_version.py +++ b/src/python/grpcio_tests/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.10.0rc1' diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb index 9d9f2f49686..784c2966501 100644 --- a/src/ruby/lib/grpc/version.rb +++ b/src/ruby/lib/grpc/version.rb @@ -14,5 +14,5 @@ # GRPC contains the General RPC module. module GRPC - VERSION = '1.10.0.dev' + VERSION = '1.10.0.pre1' end diff --git a/src/ruby/tools/version.rb b/src/ruby/tools/version.rb index 2682294bd2c..f938e65588f 100644 --- a/src/ruby/tools/version.rb +++ b/src/ruby/tools/version.rb @@ -14,6 +14,6 @@ module GRPC module Tools - VERSION = '1.10.0.dev' + VERSION = '1.10.0.pre1' end end diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index 5caa1d10787..ce55f710ebe 100644 --- a/tools/distrib/python/grpcio_tools/grpc_version.py +++ b/tools/distrib/python/grpcio_tools/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.10.0rc1' diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index 94c23fb488b..1ef6e04aee6 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/tools/doxygen/Doxyfile.c++ @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.10.0-dev +PROJECT_NUMBER = 1.10.0-pre1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index eba27054298..bc0759df733 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.10.0-dev +PROJECT_NUMBER = 1.10.0-pre1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index 04f9d788502..36c6550baf0 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 6.0.0-dev +PROJECT_NUMBER = 6.0.0-pre1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index e99c9c06b4f..f9e535df968 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 6.0.0-dev +PROJECT_NUMBER = 6.0.0-pre1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a From acdefd764686a926f6c858af4a933f3b2b32f8cf Mon Sep 17 00:00:00 2001 From: Juanli Shen Date: Thu, 22 Feb 2018 13:46:00 -0800 Subject: [PATCH 05/12] Add warmup before first batch --- test/cpp/end2end/grpclb_end2end_test.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 96bd93682e3..86c238cc2ec 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -890,7 +890,10 @@ TEST_F(UpdatesTest, UpdateBalancers) { ScheduleResponseForBalancer( 1, BalancerServiceImpl::BuildResponseForBackends(second_backend, {}), 0); - // Start servers and send 10 RPCs per server. + // Wait until the first backend is ready. + WaitForBackend(0); + + // Send 10 requests. gpr_log(GPR_INFO, "========= BEFORE FIRST BATCH =========="); CheckRpcSendOk(10); gpr_log(GPR_INFO, "========= DONE WITH FIRST BATCH =========="); @@ -952,7 +955,10 @@ TEST_F(UpdatesTest, UpdateBalancersRepeated) { ScheduleResponseForBalancer( 1, BalancerServiceImpl::BuildResponseForBackends(second_backend, {}), 0); - // Start servers and send 10 RPCs per server. + // Wait until the first backend is ready. + WaitForBackend(0); + + // Send 10 requests. gpr_log(GPR_INFO, "========= BEFORE FIRST BATCH =========="); CheckRpcSendOk(10); gpr_log(GPR_INFO, "========= DONE WITH FIRST BATCH =========="); From 1a6d3a529be65d3f75e02f522ee0c77025191fb2 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Thu, 22 Feb 2018 14:54:42 -0800 Subject: [PATCH 06/12] Add comments to the interface --- include/grpc/impl/codegen/grpc_types.h | 2 ++ src/objective-c/GRPCClient/GRPCCall+MobileLog.h | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index 85106cad106..7d31095c91a 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -309,6 +309,8 @@ typedef struct { Defaults to "blend". In the current implementation "blend" is equivalent to "latency". */ #define GRPC_ARG_OPTIMIZATION_TARGET "grpc.optimization_target" +/** Channel arg that carries the bridged objective c object for custom metrics + * logging filter. */ #define GRPC_ARG_MOBILE_LOG_CONFIG "grpc.mobile_log_config" /** \} */ diff --git a/src/objective-c/GRPCClient/GRPCCall+MobileLog.h b/src/objective-c/GRPCClient/GRPCCall+MobileLog.h index 7ccc1400840..53b347d9cad 100644 --- a/src/objective-c/GRPCClient/GRPCCall+MobileLog.h +++ b/src/objective-c/GRPCClient/GRPCCall+MobileLog.h @@ -16,11 +16,15 @@ * */ -// Set the log config object to be passed to channels as channel arg. -// The setting is only effective to channels created after setLogConfig. #import "GRPCCall.h" @interface GRPCCall (MobileLog) +// Set the object to be passed down along channel stack with channel arg +// GRPC_ARG_MOBILE_LOG_CONFIG. The setting may be used by custom channel +// filters for metrics logging. + (void)setLogConfig:(id)logConfig; + +// Obtain the object to be passed down along channel stack with channel arg +// GRPC_ARG_MOBILE_LOG_CONFIG. + (id)logConfig; @end From 2fc4ad1ed97ba5749a5450c579274172a5eead13 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Thu, 22 Feb 2018 20:45:22 -0800 Subject: [PATCH 07/12] Fix Linux artifact builds Change `git submodule` copying mechanism from the host to the docker container to use `git clone` instead of `git submodule update --init --reference`, which reaches out to the network and fails on older docker containers with deprecated openssl versions that do not support modern TLS versions required by GitHub, e.g. manylinux1. This fixes artifact builds for protoc and Python on Linux. --- tools/run_tests/dockerize/docker_run.sh | 4 +--- tools/run_tests/dockerize/docker_run_tests.sh | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/run_tests/dockerize/docker_run.sh b/tools/run_tests/dockerize/docker_run.sh index ac0d09c28be..b19cc2519a6 100755 --- a/tools/run_tests/dockerize/docker_run.sh +++ b/tools/run_tests/dockerize/docker_run.sh @@ -25,9 +25,7 @@ then # clone gRPC submodules, use data from locally cloned submodules where possible # TODO: figure out a way to eliminate this following shellcheck suppressions # shellcheck disable=SC2016,SC1004 - (cd "${EXTERNAL_GIT_ROOT}" && git submodule foreach 'cd /var/local/git/grpc \ - && git submodule update --init --reference ${EXTERNAL_GIT_ROOT}/${name} \ - ${name}') + (cd "${EXTERNAL_GIT_ROOT}" && git submodule foreach 'git clone ${EXTERNAL_GIT_ROOT}/${name} /var/local/git/grpc/${name}') else mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH" cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH"/* "/var/local/git/grpc/$RELATIVE_COPY_PATH" diff --git a/tools/run_tests/dockerize/docker_run_tests.sh b/tools/run_tests/dockerize/docker_run_tests.sh index 89ee315fd2d..4e4ca181f40 100755 --- a/tools/run_tests/dockerize/docker_run_tests.sh +++ b/tools/run_tests/dockerize/docker_run_tests.sh @@ -23,13 +23,11 @@ export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer export PATH=$PATH:/usr/bin/llvm-symbolizer mkdir -p /var/local/git -git clone /var/local/jenkins/grpc /var/local/git/grpc +git clone /var/local/jenkins/grpc /var/local/git/grpc # clone gRPC submodules, use data from locally cloned submodules where possible # TODO: figure out a way to eliminate this shellcheck suppression: # shellcheck disable=SC2016,SC1004 -(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \ -&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \ -${name}') +(cd /var/local/jenkins/grpc/ && git submodule foreach 'git clone /var/local/jenkins/grpc/{$name} /var/local/jenkins/grpc/${name}') mkdir -p reports From 7d82f79db514ce3a6f6babda3777fcacec50ecdc Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Thu, 22 Feb 2018 22:20:36 -0800 Subject: [PATCH 08/12] Bump version to v1.11 #gorgeous --- BUILD | 4 ++-- build.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILD b/BUILD index 1d5b0216526..b780e894689 100644 --- a/BUILD +++ b/BUILD @@ -64,11 +64,11 @@ config_setting( ) # This should be updated along with build.yaml -g_stands_for = "glamorous" +g_stands_for = "gorgeous" core_version = "6.0.0-dev" -version = "1.10.0-dev" +version = "1.11.0-dev" GPR_PUBLIC_HDRS = [ "include/grpc/support/alloc.h", diff --git a/build.yaml b/build.yaml index b20eba99749..a4bd8ec6700 100644 --- a/build.yaml +++ b/build.yaml @@ -13,8 +13,8 @@ settings: '#09': Per-language overrides are possible with (eg) ruby_version tag here '#10': See the expand_version.py for all the quirks here core_version: 6.0.0-dev - g_stands_for: glamorous - version: 1.10.0-dev + g_stands_for: gorgeous + version: 1.11.0-dev filegroups: - name: census public_headers: From 9073ea03efe949e8641df2a081e660af5b49b1d6 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Thu, 22 Feb 2018 22:21:33 -0800 Subject: [PATCH 09/12] Regenerate projects --- CMakeLists.txt | 2 +- Makefile | 4 ++-- gRPC-C++.podspec | 4 ++-- gRPC-Core.podspec | 2 +- gRPC-ProtoRPC.podspec | 2 +- gRPC-RxLibrary.podspec | 2 +- gRPC.podspec | 2 +- package.xml | 4 ++-- src/core/lib/surface/version.cc | 2 +- src/cpp/common/version_cc.cc | 2 +- src/csharp/Grpc.Core/Version.csproj.include | 2 +- src/csharp/Grpc.Core/VersionInfo.cs | 4 ++-- src/csharp/build_packages_dotnetcli.bat | 2 +- src/csharp/build_packages_dotnetcli.sh | 4 ++-- src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 2 +- src/objective-c/GRPCClient/private/version.h | 2 +- src/objective-c/tests/version.h | 2 +- src/php/composer.json | 2 +- src/php/ext/grpc/version.h | 2 +- src/python/grpcio/grpc/_grpcio_metadata.py | 2 +- src/python/grpcio/grpc_version.py | 2 +- src/python/grpcio_health_checking/grpc_version.py | 2 +- src/python/grpcio_reflection/grpc_version.py | 2 +- src/python/grpcio_testing/grpc_version.py | 2 +- src/python/grpcio_tests/grpc_version.py | 2 +- src/ruby/lib/grpc/version.rb | 2 +- src/ruby/tools/version.rb | 2 +- tools/distrib/python/grpcio_tools/grpc_version.py | 2 +- tools/doxygen/Doxyfile.c++ | 2 +- tools/doxygen/Doxyfile.c++.internal | 2 +- 30 files changed, 35 insertions(+), 35 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64a7dc7890e..25a965a9529 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 2.8) set(PACKAGE_NAME "grpc") -set(PACKAGE_VERSION "1.10.0-dev") +set(PACKAGE_VERSION "1.11.0-dev") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") diff --git a/Makefile b/Makefile index ba6c51a7ceb..df3e3c51490 100644 --- a/Makefile +++ b/Makefile @@ -419,8 +419,8 @@ Q = @ endif CORE_VERSION = 6.0.0-dev -CPP_VERSION = 1.10.0-dev -CSHARP_VERSION = 1.10.0-dev +CPP_VERSION = 1.11.0-dev +CSHARP_VERSION = 1.11.0-dev CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 341ed8ec4f8..bbd0ff1d9e8 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-C++' # TODO (mxyan): use version that match gRPC version when pod is stabilized - # version = '1.10.0-dev' + # version = '1.11.0-dev' version = '0.0.2' s.version = version s.summary = 'gRPC C++ library' @@ -31,7 +31,7 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - grpc_version = '1.10.0-dev' + grpc_version = '1.11.0-dev' s.source = { :git => 'https://github.com/grpc/grpc.git', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 45a9815edd6..ed290b43c45 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.10.0-dev' + version = '1.11.0-dev' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'https://grpc.io' diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index a0375bd0b83..149687e5b4c 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.10.0-dev' + version = '1.11.0-dev' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'https://grpc.io' diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index 280aafefb6e..24971744170 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-RxLibrary' - version = '1.10.0-dev' + version = '1.11.0-dev' s.version = version s.summary = 'Reactive Extensions library for iOS/OSX.' s.homepage = 'https://grpc.io' diff --git a/gRPC.podspec b/gRPC.podspec index 930d991a6c4..68e06b55362 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '1.10.0-dev' + version = '1.11.0-dev' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'https://grpc.io' diff --git a/package.xml b/package.xml index 788161a4a14..bb8e5a7b180 100644 --- a/package.xml +++ b/package.xml @@ -13,8 +13,8 @@ 2018-01-19 - 1.10.0dev - 1.10.0dev + 1.11.0dev + 1.11.0dev beta diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc index 51daad0368f..1710fd5afba 100644 --- a/src/core/lib/surface/version.cc +++ b/src/core/lib/surface/version.cc @@ -23,4 +23,4 @@ const char* grpc_version_string(void) { return "6.0.0-dev"; } -const char* grpc_g_stands_for(void) { return "glamorous"; } +const char* grpc_g_stands_for(void) { return "gorgeous"; } diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc index 4ca6afd43f2..fb1723c8168 100644 --- a/src/cpp/common/version_cc.cc +++ b/src/cpp/common/version_cc.cc @@ -22,5 +22,5 @@ #include namespace grpc { -grpc::string Version() { return "1.10.0-dev"; } +grpc::string Version() { return "1.11.0-dev"; } } // namespace grpc diff --git a/src/csharp/Grpc.Core/Version.csproj.include b/src/csharp/Grpc.Core/Version.csproj.include index 539d3a9f801..9b55f2469a6 100755 --- a/src/csharp/Grpc.Core/Version.csproj.include +++ b/src/csharp/Grpc.Core/Version.csproj.include @@ -1,7 +1,7 @@ - 1.10.0-dev + 1.11.0-dev 3.3.0 diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index f1aef46c6cb..2902aee8d9a 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -33,11 +33,11 @@ namespace Grpc.Core /// /// Current AssemblyFileVersion of gRPC C# assemblies /// - public const string CurrentAssemblyFileVersion = "1.10.0.0"; + public const string CurrentAssemblyFileVersion = "1.11.0.0"; /// /// Current version of gRPC C# /// - public const string CurrentVersion = "1.10.0-dev"; + public const string CurrentVersion = "1.11.0-dev"; } } diff --git a/src/csharp/build_packages_dotnetcli.bat b/src/csharp/build_packages_dotnetcli.bat index 4087d8b67a6..4dd4947f00e 100755 --- a/src/csharp/build_packages_dotnetcli.bat +++ b/src/csharp/build_packages_dotnetcli.bat @@ -13,7 +13,7 @@ @rem limitations under the License. @rem Current package versions -set VERSION=1.10.0-dev +set VERSION=1.11.0-dev @rem Adjust the location of nuget.exe set NUGET=C:\nuget\nuget.exe diff --git a/src/csharp/build_packages_dotnetcli.sh b/src/csharp/build_packages_dotnetcli.sh index 8ccc537a609..e3f8463ee88 100755 --- a/src/csharp/build_packages_dotnetcli.sh +++ b/src/csharp/build_packages_dotnetcli.sh @@ -39,7 +39,7 @@ dotnet pack --configuration Release Grpc.Auth --output ../../../artifacts dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts -nuget pack Grpc.nuspec -Version "1.10.0-dev" -OutputDirectory ../../artifacts -nuget pack Grpc.Tools.nuspec -Version "1.10.0-dev" -OutputDirectory ../../artifacts +nuget pack Grpc.nuspec -Version "1.11.0-dev" -OutputDirectory ../../artifacts +nuget pack Grpc.Tools.nuspec -Version "1.11.0-dev" -OutputDirectory ../../artifacts (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg) diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 037ad4d9b0e..954beed8e1a 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -42,7 +42,7 @@ Pod::Spec.new do |s| # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # before them. s.name = '!ProtoCompiler-gRPCPlugin' - v = '1.10.0-dev' + v = '1.11.0-dev' s.version = v s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.description = <<-DESC diff --git a/src/objective-c/GRPCClient/private/version.h b/src/objective-c/GRPCClient/private/version.h index 5c134e36420..405c2fff9ff 100644 --- a/src/objective-c/GRPCClient/private/version.h +++ b/src/objective-c/GRPCClient/private/version.h @@ -23,4 +23,4 @@ // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.10.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.11.0-dev" diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h index 5140aa23a67..6f6cd25007f 100644 --- a/src/objective-c/tests/version.h +++ b/src/objective-c/tests/version.h @@ -23,5 +23,5 @@ // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.10.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.11.0-dev" #define GRPC_C_VERSION_STRING @"6.0.0-dev" diff --git a/src/php/composer.json b/src/php/composer.json index ea214179562..dbf0cc35fd1 100644 --- a/src/php/composer.json +++ b/src/php/composer.json @@ -2,7 +2,7 @@ "name": "grpc/grpc-dev", "description": "gRPC library for PHP - for Developement use only", "license": "Apache-2.0", - "version": "1.10.0", + "version": "1.11.0", "require": { "php": ">=5.5.0", "google/protobuf": "^v3.3.0" diff --git a/src/php/ext/grpc/version.h b/src/php/ext/grpc/version.h index 408f2a47656..dd2a701ada7 100644 --- a/src/php/ext/grpc/version.h +++ b/src/php/ext/grpc/version.h @@ -20,6 +20,6 @@ #ifndef VERSION_H #define VERSION_H -#define PHP_GRPC_VERSION "1.10.0dev" +#define PHP_GRPC_VERSION "1.11.0dev" #endif /* VERSION_H */ diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py index 6032828c776..4a69d859fc3 100644 --- a/src/python/grpcio/grpc/_grpcio_metadata.py +++ b/src/python/grpcio/grpc/_grpcio_metadata.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!! -__version__ = """1.10.0.dev0""" +__version__ = """1.11.0.dev0""" diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py index a654eb026a7..32e82493f3f 100644 --- a/src/python/grpcio/grpc_version.py +++ b/src/python/grpcio/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.11.0.dev0' diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py index d3185c69725..ad4c85cc120 100644 --- a/src/python/grpcio_health_checking/grpc_version.py +++ b/src/python/grpcio_health_checking/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.11.0.dev0' diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py index 7203d0d3213..6322d847b1f 100644 --- a/src/python/grpcio_reflection/grpc_version.py +++ b/src/python/grpcio_reflection/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.11.0.dev0' diff --git a/src/python/grpcio_testing/grpc_version.py b/src/python/grpcio_testing/grpc_version.py index bf9e55e10e2..1e75fea12eb 100644 --- a/src/python/grpcio_testing/grpc_version.py +++ b/src/python/grpcio_testing/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.11.0.dev0' diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py index 2583e420160..0cd7bd257ff 100644 --- a/src/python/grpcio_tests/grpc_version.py +++ b/src/python/grpcio_tests/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.11.0.dev0' diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb index 9d9f2f49686..256a543a9fd 100644 --- a/src/ruby/lib/grpc/version.rb +++ b/src/ruby/lib/grpc/version.rb @@ -14,5 +14,5 @@ # GRPC contains the General RPC module. module GRPC - VERSION = '1.10.0.dev' + VERSION = '1.11.0.dev' end diff --git a/src/ruby/tools/version.rb b/src/ruby/tools/version.rb index 2682294bd2c..8dc1623d6fd 100644 --- a/src/ruby/tools/version.rb +++ b/src/ruby/tools/version.rb @@ -14,6 +14,6 @@ module GRPC module Tools - VERSION = '1.10.0.dev' + VERSION = '1.11.0.dev' end end diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index 5caa1d10787..e8ca6851ebf 100644 --- a/tools/distrib/python/grpcio_tools/grpc_version.py +++ b/tools/distrib/python/grpcio_tools/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION = '1.10.0.dev0' +VERSION = '1.11.0.dev0' diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index 94c23fb488b..eb6700d5292 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/tools/doxygen/Doxyfile.c++ @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.10.0-dev +PROJECT_NUMBER = 1.11.0-dev # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index eba27054298..7eab3f09fd5 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.10.0-dev +PROJECT_NUMBER = 1.11.0-dev # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a From 5b0685b6c286489dd8cd39611e7409df09ccf52e Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Thu, 22 Feb 2018 22:28:14 -0800 Subject: [PATCH 10/12] Fix submodule handling in dockerized tests --- tools/run_tests/dockerize/docker_run.sh | 1 + tools/run_tests/dockerize/docker_run_tests.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/run_tests/dockerize/docker_run.sh b/tools/run_tests/dockerize/docker_run.sh index b19cc2519a6..e525019c447 100755 --- a/tools/run_tests/dockerize/docker_run.sh +++ b/tools/run_tests/dockerize/docker_run.sh @@ -26,6 +26,7 @@ then # TODO: figure out a way to eliminate this following shellcheck suppressions # shellcheck disable=SC2016,SC1004 (cd "${EXTERNAL_GIT_ROOT}" && git submodule foreach 'git clone ${EXTERNAL_GIT_ROOT}/${name} /var/local/git/grpc/${name}') + (cd /var/local/git/grpc && git submodule init) else mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH" cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH"/* "/var/local/git/grpc/$RELATIVE_COPY_PATH" diff --git a/tools/run_tests/dockerize/docker_run_tests.sh b/tools/run_tests/dockerize/docker_run_tests.sh index 4e4ca181f40..c41734c92d2 100755 --- a/tools/run_tests/dockerize/docker_run_tests.sh +++ b/tools/run_tests/dockerize/docker_run_tests.sh @@ -26,8 +26,9 @@ mkdir -p /var/local/git git clone /var/local/jenkins/grpc /var/local/git/grpc # clone gRPC submodules, use data from locally cloned submodules where possible # TODO: figure out a way to eliminate this shellcheck suppression: -# shellcheck disable=SC2016,SC1004 -(cd /var/local/jenkins/grpc/ && git submodule foreach 'git clone /var/local/jenkins/grpc/{$name} /var/local/jenkins/grpc/${name}') +# shellcheck disable=SC2016 +(cd /var/local/jenkins/grpc/ && git submodule foreach 'git clone /var/local/jenkins/grpc/${name} /var/local/git/grpc/${name}') +(cd /var/local/git/grpc/ && git submodule init) mkdir -p reports From db3e898a981ea0ae49823415efab78edd09a90ab Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Wed, 21 Feb 2018 16:59:24 -0800 Subject: [PATCH 11/12] Add a sanity check for inclusion of port_platform.h --- include/grpc/byte_buffer.h | 2 + include/grpc/byte_buffer_reader.h | 2 + include/grpc/census.h | 2 + include/grpc/fork.h | 2 + include/grpc/grpc.h | 2 + include/grpc/grpc_cronet.h | 2 + include/grpc/grpc_posix.h | 3 +- include/grpc/grpc_security.h | 2 + include/grpc/impl/codegen/byte_buffer.h | 2 + include/grpc/impl/codegen/sync.h | 1 + include/grpc/impl/codegen/sync_custom.h | 2 + include/grpc/impl/codegen/sync_generic.h | 2 + include/grpc/impl/codegen/sync_posix.h | 2 + include/grpc/impl/codegen/sync_windows.h | 2 + include/grpc/slice.h | 2 + include/grpc/slice_buffer.h | 2 + include/grpc/status.h | 2 + include/grpc/support/alloc.h | 4 +- include/grpc/support/atm.h | 2 + include/grpc/support/atm_gcc_atomic.h | 2 + include/grpc/support/atm_gcc_sync.h | 2 + include/grpc/support/atm_windows.h | 2 + include/grpc/support/log.h | 1 + include/grpc/support/sync.h | 2 + include/grpc/support/sync_custom.h | 2 + include/grpc/support/sync_generic.h | 2 + include/grpc/support/sync_posix.h | 2 + include/grpc/support/sync_windows.h | 2 + include/grpc/support/time.h | 2 + src/core/ext/census/grpc_context.cc | 2 + .../filters/client_channel/backup_poller.cc | 2 + .../filters/client_channel/backup_poller.h | 2 + .../client_channel/channel_connectivity.cc | 2 + .../filters/client_channel/client_channel.h | 2 + .../client_channel/client_channel_factory.cc | 2 + .../client_channel/client_channel_factory.h | 2 + .../ext/filters/client_channel/connector.cc | 2 + .../ext/filters/client_channel/connector.h | 2 + .../client_channel/http_connect_handshaker.cc | 2 + .../ext/filters/client_channel/http_proxy.cc | 2 + .../ext/filters/client_channel/lb_policy.cc | 2 + .../ext/filters/client_channel/lb_policy.h | 2 + .../grpclb/client_load_reporting_filter.cc | 2 + .../grpclb/client_load_reporting_filter.h | 2 + .../client_channel/lb_policy/grpclb/grpclb.cc | 2 + .../lb_policy/grpclb/grpclb_channel.cc | 2 + .../lb_policy/grpclb/grpclb_channel.h | 2 + .../lb_policy/grpclb/grpclb_channel_secure.cc | 2 + .../lb_policy/grpclb/grpclb_client_stats.cc | 2 + .../lb_policy/grpclb/grpclb_client_stats.h | 2 + .../lb_policy/grpclb/load_balancer_api.cc | 2 + .../lb_policy/grpclb/load_balancer_api.h | 2 + .../lb_policy/pick_first/pick_first.cc | 2 + .../lb_policy/round_robin/round_robin.cc | 2 + .../lb_policy/subchannel_list.cc | 2 + .../lb_policy/subchannel_list.h | 2 + .../client_channel/lb_policy_factory.cc | 2 + .../client_channel/lb_policy_factory.h | 2 + .../client_channel/lb_policy_registry.cc | 2 + .../client_channel/lb_policy_registry.h | 2 + .../filters/client_channel/parse_address.cc | 2 + .../filters/client_channel/parse_address.h | 2 + .../filters/client_channel/proxy_mapper.cc | 2 + .../ext/filters/client_channel/proxy_mapper.h | 2 + .../client_channel/proxy_mapper_registry.cc | 2 + .../client_channel/proxy_mapper_registry.h | 2 + .../ext/filters/client_channel/resolver.cc | 2 + .../ext/filters/client_channel/resolver.h | 2 + .../resolver/dns/c_ares/dns_resolver_ares.cc | 1 + .../resolver/dns/c_ares/grpc_ares_ev_driver.h | 2 + .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 1 + .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 1 + .../resolver/dns/c_ares/grpc_ares_wrapper.h | 2 + .../dns/c_ares/grpc_ares_wrapper_fallback.cc | 1 + .../resolver/fake/fake_resolver.cc | 3 +- .../resolver/fake/fake_resolver.h | 2 + .../resolver/sockaddr/sockaddr_resolver.cc | 3 +- .../filters/client_channel/resolver_factory.h | 2 + .../client_channel/resolver_registry.cc | 2 + .../client_channel/resolver_registry.h | 2 + .../filters/client_channel/retry_throttle.cc | 2 + .../filters/client_channel/retry_throttle.h | 2 + .../ext/filters/client_channel/subchannel.cc | 2 + .../ext/filters/client_channel/subchannel.h | 2 + .../client_channel/subchannel_index.cc | 2 + .../filters/client_channel/subchannel_index.h | 2 + .../ext/filters/client_channel/uri_parser.cc | 3 +- .../ext/filters/client_channel/uri_parser.h | 2 + .../ext/filters/deadline/deadline_filter.cc | 2 + .../ext/filters/deadline/deadline_filter.h | 2 + .../filters/http/client/http_client_filter.cc | 4 +- .../filters/http/client/http_client_filter.h | 2 + .../ext/filters/http/http_filters_plugin.cc | 2 + .../message_compress_filter.cc | 2 + .../message_compress_filter.h | 2 + .../filters/http/server/http_server_filter.cc | 2 + .../filters/http/server/http_server_filter.h | 2 + .../server_load_reporting_filter.cc | 2 + .../server_load_reporting_filter.h | 2 + .../server_load_reporting_plugin.h | 2 + .../ext/filters/max_age/max_age_filter.cc | 2 + src/core/ext/filters/max_age/max_age_filter.h | 2 + .../message_size/message_size_filter.cc | 2 + .../message_size/message_size_filter.h | 2 + .../workaround_cronet_compression_filter.cc | 2 + .../workaround_cronet_compression_filter.h | 2 + .../filters/workarounds/workaround_utils.cc | 2 + .../filters/workarounds/workaround_utils.h | 2 + src/core/ext/transport/chttp2/alpn/alpn.cc | 4 +- src/core/ext/transport/chttp2/alpn/alpn.h | 2 + .../chttp2/client/chttp2_connector.cc | 2 + .../chttp2/client/chttp2_connector.h | 2 + .../chttp2/client/insecure/channel_create.cc | 2 + .../client/insecure/channel_create_posix.cc | 3 +- .../client/secure/secure_channel_create.cc | 2 + .../transport/chttp2/server/chttp2_server.cc | 2 + .../transport/chttp2/server/chttp2_server.h | 2 + .../chttp2/server/insecure/server_chttp2.cc | 2 + .../server/insecure/server_chttp2_posix.cc | 3 +- .../server/secure/server_secure_chttp2.cc | 2 + .../transport/chttp2/transport/bin_decoder.cc | 4 +- .../transport/chttp2/transport/bin_decoder.h | 2 + .../transport/chttp2/transport/bin_encoder.cc | 2 + .../transport/chttp2/transport/bin_encoder.h | 2 + .../chttp2/transport/chttp2_plugin.cc | 2 + .../chttp2/transport/chttp2_transport.cc | 4 +- .../chttp2/transport/chttp2_transport.h | 2 + .../chttp2/transport/flow_control.cc | 2 + .../transport/chttp2/transport/flow_control.h | 1 + .../ext/transport/chttp2/transport/frame.h | 3 +- .../transport/chttp2/transport/frame_data.cc | 2 + .../transport/chttp2/transport/frame_data.h | 2 + .../chttp2/transport/frame_goaway.cc | 2 + .../transport/chttp2/transport/frame_goaway.h | 3 +- .../transport/chttp2/transport/frame_ping.cc | 2 + .../transport/chttp2/transport/frame_ping.h | 2 + .../chttp2/transport/frame_rst_stream.cc | 2 + .../chttp2/transport/frame_rst_stream.h | 2 + .../chttp2/transport/frame_settings.cc | 2 + .../chttp2/transport/frame_settings.h | 3 +- .../chttp2/transport/frame_window_update.cc | 2 + .../chttp2/transport/frame_window_update.h | 2 + .../chttp2/transport/hpack_encoder.cc | 2 + .../chttp2/transport/hpack_encoder.h | 3 +- .../chttp2/transport/hpack_parser.cc | 3 +- .../transport/chttp2/transport/hpack_parser.h | 3 +- .../transport/chttp2/transport/hpack_table.cc | 2 + .../transport/chttp2/transport/hpack_table.h | 3 +- .../chttp2/transport/http2_settings.cc | 2 + .../chttp2/transport/http2_settings.h | 2 + .../transport/chttp2/transport/huffsyms.cc | 2 + .../chttp2/transport/incoming_metadata.cc | 2 + .../chttp2/transport/incoming_metadata.h | 2 + .../ext/transport/chttp2/transport/internal.h | 2 + .../ext/transport/chttp2/transport/parsing.cc | 2 + .../chttp2/transport/stream_lists.cc | 2 + .../transport/chttp2/transport/stream_map.cc | 2 + .../ext/transport/chttp2/transport/varint.cc | 2 + .../ext/transport/chttp2/transport/writing.cc | 2 + .../cronet/transport/cronet_api_dummy.cc | 2 + .../cronet/transport/cronet_transport.cc | 3 +- .../cronet/transport/cronet_transport.h | 2 + .../ext/transport/inproc/inproc_plugin.cc | 2 + .../ext/transport/inproc/inproc_transport.cc | 4 +- .../ext/transport/inproc/inproc_transport.h | 2 + src/core/lib/avl/avl.cc | 2 + src/core/lib/avl/avl.h | 2 + src/core/lib/backoff/backoff.cc | 2 + src/core/lib/backoff/backoff.h | 2 + src/core/lib/channel/channel_args.h | 2 + src/core/lib/channel/channel_stack.cc | 4 +- src/core/lib/channel/channel_stack.h | 2 + src/core/lib/channel/channel_stack_builder.cc | 2 + src/core/lib/channel/channel_stack_builder.h | 2 + src/core/lib/channel/connected_channel.cc | 2 + src/core/lib/channel/connected_channel.h | 2 + src/core/lib/channel/handshaker.cc | 2 + src/core/lib/channel/handshaker.h | 2 + src/core/lib/channel/handshaker_factory.cc | 2 + src/core/lib/channel/handshaker_factory.h | 2 + src/core/lib/channel/handshaker_registry.cc | 2 + src/core/lib/channel/handshaker_registry.h | 2 + src/core/lib/compression/algorithm_metadata.h | 2 + src/core/lib/compression/compression.cc | 2 + .../lib/compression/compression_internal.cc | 2 + .../lib/compression/compression_internal.h | 2 + src/core/lib/compression/message_compress.cc | 2 + src/core/lib/compression/message_compress.h | 2 + .../lib/compression/stream_compression.cc | 2 + src/core/lib/compression/stream_compression.h | 2 + .../compression/stream_compression_gzip.cc | 2 + .../lib/compression/stream_compression_gzip.h | 2 + .../stream_compression_identity.cc | 2 + .../compression/stream_compression_identity.h | 2 + src/core/lib/debug/stats.cc | 2 + src/core/lib/debug/stats.h | 2 + src/core/lib/debug/stats_data.cc | 4 +- src/core/lib/debug/stats_data.h | 2 + src/core/lib/debug/trace.cc | 2 + src/core/lib/debug/trace.h | 3 +- src/core/lib/gpr/alloc.cc | 3 +- src/core/lib/gpr/arena.cc | 2 + src/core/lib/gpr/arena.h | 2 + src/core/lib/gpr/atm.cc | 2 + src/core/lib/gpr/env.h | 2 + src/core/lib/gpr/fork.cc | 2 + src/core/lib/gpr/host_port.cc | 2 + src/core/lib/gpr/log.cc | 3 +- src/core/lib/gpr/mpscq.cc | 2 + src/core/lib/gpr/mpscq.h | 2 + src/core/lib/gpr/murmur_hash.cc | 2 + src/core/lib/gpr/spinlock.h | 2 + src/core/lib/gpr/string.cc | 3 +- src/core/lib/gpr/string.h | 4 +- src/core/lib/gpr/sync.cc | 2 + src/core/lib/gpr/thd.cc | 2 + src/core/lib/gpr/thd.h | 1 + src/core/lib/gpr/time.cc | 2 + src/core/lib/gpr/time_posix.cc | 1 + src/core/lib/gpr/time_precise.cc | 2 + src/core/lib/gpr/time_precise.h | 2 + src/core/lib/gpr/tls_gcc.h | 2 + src/core/lib/gpr/tls_msvc.h | 2 + src/core/lib/gpr/tls_pthread.h | 2 + src/core/lib/gpr/tmpfile.h | 2 + src/core/lib/gprpp/atomic_with_atm.h | 2 + src/core/lib/gprpp/atomic_with_std.h | 2 + src/core/lib/gprpp/inlined_vector.h | 2 + src/core/lib/gprpp/manual_constructor.h | 2 + src/core/lib/gprpp/memory.h | 2 + src/core/lib/gprpp/orphanable.h | 2 + src/core/lib/gprpp/ref_counted.h | 2 + src/core/lib/gprpp/ref_counted_ptr.h | 2 + src/core/lib/http/format_request.cc | 2 + src/core/lib/http/format_request.h | 2 + src/core/lib/http/httpcli.cc | 2 + src/core/lib/http/httpcli.h | 2 + .../lib/http/httpcli_security_connector.cc | 2 + src/core/lib/http/parser.cc | 2 + src/core/lib/http/parser.h | 3 +- src/core/lib/iomgr/call_combiner.cc | 2 + src/core/lib/iomgr/call_combiner.h | 2 + src/core/lib/iomgr/combiner.cc | 2 + src/core/lib/iomgr/combiner.h | 2 + src/core/lib/iomgr/endpoint.cc | 2 + src/core/lib/iomgr/endpoint.h | 2 + src/core/lib/iomgr/endpoint_pair.h | 2 + src/core/lib/iomgr/endpoint_pair_posix.cc | 2 + src/core/lib/iomgr/endpoint_pair_uv.cc | 2 + src/core/lib/iomgr/endpoint_pair_windows.cc | 2 + src/core/lib/iomgr/error.h | 2 + src/core/lib/iomgr/error_internal.h | 2 + src/core/lib/iomgr/ev_epoll1_linux.cc | 2 + src/core/lib/iomgr/ev_epoll1_linux.h | 2 + src/core/lib/iomgr/ev_epollex_linux.cc | 2 + src/core/lib/iomgr/ev_epollex_linux.h | 2 + src/core/lib/iomgr/ev_epollsig_linux.cc | 2 + src/core/lib/iomgr/ev_epollsig_linux.h | 2 + src/core/lib/iomgr/ev_poll_posix.cc | 2 + src/core/lib/iomgr/ev_poll_posix.h | 2 + src/core/lib/iomgr/ev_posix.cc | 2 + src/core/lib/iomgr/ev_posix.h | 2 + src/core/lib/iomgr/ev_windows.cc | 2 + src/core/lib/iomgr/exec_ctx.cc | 2 + src/core/lib/iomgr/exec_ctx.h | 2 + src/core/lib/iomgr/executor.cc | 2 + src/core/lib/iomgr/executor.h | 2 + src/core/lib/iomgr/fork_posix.cc | 2 + src/core/lib/iomgr/fork_windows.cc | 2 + src/core/lib/iomgr/gethostname_fallback.cc | 2 + .../lib/iomgr/gethostname_host_name_max.cc | 2 + src/core/lib/iomgr/gethostname_sysconf.cc | 2 + src/core/lib/iomgr/iocp_windows.cc | 2 + src/core/lib/iomgr/iocp_windows.h | 2 + src/core/lib/iomgr/iomgr.h | 2 + src/core/lib/iomgr/iomgr_internal.h | 2 + src/core/lib/iomgr/iomgr_posix.cc | 2 + src/core/lib/iomgr/iomgr_posix.h | 2 + src/core/lib/iomgr/iomgr_uv.cc | 2 + src/core/lib/iomgr/iomgr_uv.h | 2 + src/core/lib/iomgr/iomgr_windows.cc | 2 + .../lib/iomgr/is_epollexclusive_available.cc | 2 + .../lib/iomgr/is_epollexclusive_available.h | 2 + src/core/lib/iomgr/load_file.cc | 2 + src/core/lib/iomgr/load_file.h | 2 + src/core/lib/iomgr/lockfree_event.cc | 2 + src/core/lib/iomgr/lockfree_event.h | 2 + src/core/lib/iomgr/nameser.h | 2 + src/core/lib/iomgr/network_status_tracker.cc | 4 +- src/core/lib/iomgr/network_status_tracker.h | 2 + src/core/lib/iomgr/polling_entity.cc | 2 + src/core/lib/iomgr/polling_entity.h | 2 + src/core/lib/iomgr/pollset.h | 1 + src/core/lib/iomgr/pollset_set.h | 2 + src/core/lib/iomgr/pollset_set_uv.cc | 2 + src/core/lib/iomgr/pollset_set_windows.cc | 2 + src/core/lib/iomgr/pollset_set_windows.h | 2 + src/core/lib/iomgr/pollset_uv.cc | 2 + src/core/lib/iomgr/pollset_windows.cc | 2 + src/core/lib/iomgr/pollset_windows.h | 2 + src/core/lib/iomgr/resolve_address.h | 2 + src/core/lib/iomgr/resolve_address_posix.cc | 2 + src/core/lib/iomgr/resolve_address_uv.cc | 2 + src/core/lib/iomgr/resolve_address_windows.cc | 2 + src/core/lib/iomgr/resource_quota.cc | 2 + src/core/lib/iomgr/resource_quota.h | 2 + src/core/lib/iomgr/sockaddr.h | 2 + src/core/lib/iomgr/sockaddr_posix.h | 2 + src/core/lib/iomgr/sockaddr_utils.cc | 3 +- src/core/lib/iomgr/sockaddr_utils.h | 2 + src/core/lib/iomgr/sockaddr_windows.h | 2 + src/core/lib/iomgr/socket_factory_posix.cc | 2 + src/core/lib/iomgr/socket_factory_posix.h | 2 + src/core/lib/iomgr/socket_mutator.cc | 2 + src/core/lib/iomgr/socket_mutator.h | 2 + src/core/lib/iomgr/socket_utils.h | 2 + .../lib/iomgr/socket_utils_common_posix.cc | 3 +- src/core/lib/iomgr/socket_utils_linux.cc | 2 + src/core/lib/iomgr/socket_utils_posix.cc | 2 + src/core/lib/iomgr/socket_utils_posix.h | 2 + src/core/lib/iomgr/socket_utils_uv.cc | 2 + src/core/lib/iomgr/socket_utils_windows.cc | 2 + src/core/lib/iomgr/socket_windows.cc | 2 + src/core/lib/iomgr/socket_windows.h | 1 + src/core/lib/iomgr/sys_epoll_wrapper.h | 2 + src/core/lib/iomgr/tcp_client.h | 2 + src/core/lib/iomgr/tcp_client_posix.cc | 2 + src/core/lib/iomgr/tcp_client_posix.h | 2 + src/core/lib/iomgr/tcp_client_uv.cc | 2 + src/core/lib/iomgr/tcp_client_windows.cc | 2 + src/core/lib/iomgr/tcp_posix.cc | 2 + src/core/lib/iomgr/tcp_posix.h | 2 + src/core/lib/iomgr/tcp_server.h | 2 + src/core/lib/iomgr/tcp_server_posix.cc | 2 + src/core/lib/iomgr/tcp_server_utils_posix.h | 2 + .../iomgr/tcp_server_utils_posix_common.cc | 2 + .../iomgr/tcp_server_utils_posix_ifaddrs.cc | 2 + .../iomgr/tcp_server_utils_posix_noifaddrs.cc | 2 + src/core/lib/iomgr/tcp_server_uv.cc | 2 + src/core/lib/iomgr/tcp_server_windows.cc | 2 + src/core/lib/iomgr/tcp_uv.cc | 2 + src/core/lib/iomgr/tcp_uv.h | 2 + src/core/lib/iomgr/tcp_windows.cc | 2 + src/core/lib/iomgr/tcp_windows.h | 2 + src/core/lib/iomgr/time_averaged_stats.cc | 2 + src/core/lib/iomgr/timer.h | 3 +- src/core/lib/iomgr/timer_generic.cc | 2 + src/core/lib/iomgr/timer_generic.h | 2 + src/core/lib/iomgr/timer_heap.cc | 2 + src/core/lib/iomgr/timer_heap.h | 2 + src/core/lib/iomgr/timer_manager.cc | 3 +- src/core/lib/iomgr/timer_manager.h | 2 + src/core/lib/iomgr/timer_uv.cc | 2 + src/core/lib/iomgr/timer_uv.h | 2 + src/core/lib/iomgr/udp_server.cc | 2 + src/core/lib/iomgr/udp_server.h | 2 + src/core/lib/iomgr/unix_sockets_posix.cc | 2 + src/core/lib/iomgr/unix_sockets_posix.h | 2 + src/core/lib/iomgr/unix_sockets_posix_noop.cc | 2 + src/core/lib/iomgr/wakeup_fd_cv.cc | 2 + src/core/lib/iomgr/wakeup_fd_cv.h | 2 + src/core/lib/iomgr/wakeup_fd_eventfd.cc | 2 + src/core/lib/iomgr/wakeup_fd_nospecial.cc | 2 + src/core/lib/iomgr/wakeup_fd_pipe.cc | 2 + src/core/lib/iomgr/wakeup_fd_pipe.h | 2 + src/core/lib/iomgr/wakeup_fd_posix.cc | 2 + src/core/lib/iomgr/wakeup_fd_posix.h | 2 + src/core/lib/json/json.cc | 2 + src/core/lib/json/json.h | 2 + src/core/lib/json/json_reader.cc | 4 +- src/core/lib/json/json_reader.h | 1 + src/core/lib/json/json_string.cc | 2 + src/core/lib/json/json_writer.cc | 4 +- src/core/lib/json/json_writer.h | 2 + .../lib/security/context/security_context.cc | 2 + .../lib/security/context/security_context.h | 2 + .../composite/composite_credentials.cc | 2 + .../composite/composite_credentials.h | 2 + .../lib/security/credentials/credentials.cc | 2 + .../lib/security/credentials/credentials.h | 2 + .../credentials/credentials_metadata.cc | 2 + .../credentials/fake/fake_credentials.cc | 2 + .../credentials/fake/fake_credentials.h | 2 + .../google_default/credentials_generic.cc | 2 + .../google_default_credentials.cc | 2 + .../credentials/iam/iam_credentials.cc | 2 + .../credentials/iam/iam_credentials.h | 2 + .../security/credentials/jwt/json_token.cc | 2 + .../lib/security/credentials/jwt/json_token.h | 2 + .../credentials/jwt/jwt_credentials.h | 2 + .../security/credentials/jwt/jwt_verifier.cc | 2 + .../security/credentials/jwt/jwt_verifier.h | 2 + .../credentials/oauth2/oauth2_credentials.cc | 2 + .../credentials/oauth2/oauth2_credentials.h | 2 + .../credentials/plugin/plugin_credentials.cc | 2 + .../credentials/plugin/plugin_credentials.h | 2 + .../credentials/ssl/ssl_credentials.cc | 2 + .../credentials/ssl/ssl_credentials.h | 2 + .../security_connector/security_connector.cc | 2 + .../security_connector/security_connector.h | 2 + .../lib/security/transport/auth_filters.h | 2 + .../security/transport/client_auth_filter.cc | 2 + .../lib/security/transport/lb_targets_info.cc | 2 + .../lib/security/transport/lb_targets_info.h | 2 + .../lib/security/transport/secure_endpoint.cc | 2 + .../lib/security/transport/secure_endpoint.h | 2 + .../security/transport/security_handshaker.cc | 2 + .../security/transport/security_handshaker.h | 2 + .../security/transport/server_auth_filter.cc | 2 + src/core/lib/security/transport/tsi_error.cc | 2 + src/core/lib/security/transport/tsi_error.h | 2 + src/core/lib/security/util/json_util.cc | 2 + src/core/lib/security/util/json_util.h | 2 + src/core/lib/slice/b64.cc | 2 + src/core/lib/slice/b64.h | 2 + src/core/lib/slice/percent_encoding.cc | 2 + src/core/lib/slice/percent_encoding.h | 2 + src/core/lib/slice/slice.cc | 2 + src/core/lib/slice/slice_buffer.cc | 3 +- src/core/lib/slice/slice_hash_table.cc | 2 + src/core/lib/slice/slice_hash_table.h | 2 + src/core/lib/slice/slice_intern.cc | 2 + src/core/lib/slice/slice_internal.h | 2 + src/core/lib/slice/slice_string_helpers.cc | 2 + src/core/lib/slice/slice_string_helpers.h | 3 +- src/core/lib/slice/slice_traits.h | 2 + src/core/lib/surface/api_trace.cc | 4 +- src/core/lib/surface/api_trace.h | 2 + src/core/lib/surface/byte_buffer.cc | 2 + src/core/lib/surface/byte_buffer_reader.cc | 2 + src/core/lib/surface/call.cc | 2 + src/core/lib/surface/call.h | 2 + src/core/lib/surface/call_details.cc | 2 + src/core/lib/surface/call_log_batch.cc | 2 + src/core/lib/surface/call_test_only.h | 2 + src/core/lib/surface/channel.cc | 2 + src/core/lib/surface/channel.h | 2 + src/core/lib/surface/channel_init.cc | 2 + src/core/lib/surface/channel_init.h | 2 + src/core/lib/surface/channel_ping.cc | 2 + src/core/lib/surface/channel_stack_type.cc | 5 +- src/core/lib/surface/channel_stack_type.h | 2 + src/core/lib/surface/completion_queue.h | 2 + .../lib/surface/completion_queue_factory.cc | 4 +- .../lib/surface/completion_queue_factory.h | 2 + src/core/lib/surface/event_string.cc | 2 + src/core/lib/surface/event_string.h | 2 + src/core/lib/surface/init_unsecure.cc | 2 + src/core/lib/surface/lame_client.cc | 2 + src/core/lib/surface/lame_client.h | 2 + src/core/lib/surface/metadata_array.cc | 2 + src/core/lib/surface/server.cc | 2 + src/core/lib/surface/server.h | 2 + src/core/lib/surface/validate_metadata.cc | 3 +- src/core/lib/surface/validate_metadata.h | 2 + src/core/lib/surface/version.cc | 2 + src/core/lib/transport/bdp_estimator.cc | 2 + src/core/lib/transport/byte_stream.cc | 2 + src/core/lib/transport/byte_stream.h | 2 + src/core/lib/transport/connectivity_state.cc | 2 + src/core/lib/transport/connectivity_state.h | 2 + src/core/lib/transport/error_utils.cc | 2 + src/core/lib/transport/error_utils.h | 2 + src/core/lib/transport/metadata.cc | 2 + src/core/lib/transport/metadata.h | 2 + src/core/lib/transport/metadata_batch.cc | 2 + src/core/lib/transport/metadata_batch.h | 3 +- src/core/lib/transport/pid_controller.cc | 2 + src/core/lib/transport/pid_controller.h | 2 + src/core/lib/transport/service_config.cc | 2 + src/core/lib/transport/service_config.h | 2 + src/core/lib/transport/static_metadata.cc | 2 + src/core/lib/transport/static_metadata.h | 2 + src/core/lib/transport/status_conversion.cc | 2 + src/core/lib/transport/status_conversion.h | 2 + src/core/lib/transport/timeout_encoding.cc | 3 +- src/core/lib/transport/timeout_encoding.h | 2 + src/core/lib/transport/transport.cc | 2 + src/core/lib/transport/transport.h | 2 + src/core/lib/transport/transport_impl.h | 2 + .../grpc_cronet_plugin_registry.cc | 2 + .../plugin_registry/grpc_plugin_registry.cc | 2 + .../grpc_unsecure_plugin_registry.cc | 2 + src/core/tsi/alts_transport_security.cc | 2 + src/core/tsi/alts_transport_security.h | 2 + src/core/tsi/fake_transport_security.cc | 3 +- src/core/tsi/fake_transport_security.h | 2 + src/core/tsi/ssl_transport_security.cc | 4 +- src/core/tsi/ssl_transport_security.h | 2 + src/core/tsi/ssl_types.h | 2 + src/core/tsi/transport_security.cc | 2 + src/core/tsi/transport_security.h | 2 + src/core/tsi/transport_security_adapter.cc | 2 + src/core/tsi/transport_security_adapter.h | 2 + src/core/tsi/transport_security_grpc.cc | 2 + src/core/tsi/transport_security_grpc.h | 2 + src/core/tsi/transport_security_interface.h | 2 + .../src/core/lib/surface/version.cc.template | 2 + templates/src/core/plugin_registry.template | 2 + tools/run_tests/sanity/check_port_platform.py | 64 +++++++++++++++++++ tools/run_tests/sanity/sanity_tests.yaml | 1 + 501 files changed, 1061 insertions(+), 52 deletions(-) create mode 100755 tools/run_tests/sanity/check_port_platform.py diff --git a/include/grpc/byte_buffer.h b/include/grpc/byte_buffer.h index 7669582af27..ee740f47944 100644 --- a/include/grpc/byte_buffer.h +++ b/include/grpc/byte_buffer.h @@ -19,6 +19,8 @@ #ifndef GRPC_BYTE_BUFFER_H #define GRPC_BYTE_BUFFER_H +#include + #include #include diff --git a/include/grpc/byte_buffer_reader.h b/include/grpc/byte_buffer_reader.h index 6bd07847880..15e06cad7c1 100644 --- a/include/grpc/byte_buffer_reader.h +++ b/include/grpc/byte_buffer_reader.h @@ -19,6 +19,8 @@ #ifndef GRPC_BYTE_BUFFER_READER_H #define GRPC_BYTE_BUFFER_READER_H +#include + #include #endif /* GRPC_BYTE_BUFFER_READER_H */ diff --git a/include/grpc/census.h b/include/grpc/census.h index 2258af88989..4894f1c0965 100644 --- a/include/grpc/census.h +++ b/include/grpc/census.h @@ -19,6 +19,8 @@ #ifndef GRPC_CENSUS_H #define GRPC_CENSUS_H +#include + #include #ifdef __cplusplus diff --git a/include/grpc/fork.h b/include/grpc/fork.h index ca45e1139c0..26f9df9871b 100644 --- a/include/grpc/fork.h +++ b/include/grpc/fork.h @@ -19,6 +19,8 @@ #ifndef GRPC_FORK_H #define GRPC_FORK_H +#include + #include #endif /* GRPC_FORK_H */ diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index aec78be31b7..c129a66949f 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -19,6 +19,8 @@ #ifndef GRPC_GRPC_H #define GRPC_GRPC_H +#include + #include #include diff --git a/include/grpc/grpc_cronet.h b/include/grpc/grpc_cronet.h index 127d5d038d0..289cfcda675 100644 --- a/include/grpc/grpc_cronet.h +++ b/include/grpc/grpc_cronet.h @@ -19,6 +19,8 @@ #ifndef GRPC_GRPC_CRONET_H #define GRPC_GRPC_CRONET_H +#include + #include #ifdef __cplusplus diff --git a/include/grpc/grpc_posix.h b/include/grpc/grpc_posix.h index fa7ebced3f3..5f1ada5aaf5 100644 --- a/include/grpc/grpc_posix.h +++ b/include/grpc/grpc_posix.h @@ -19,9 +19,10 @@ #ifndef GRPC_GRPC_POSIX_H #define GRPC_GRPC_POSIX_H -#include #include +#include + #include #ifdef __cplusplus diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h index 08776337cc5..abc591fd758 100644 --- a/include/grpc/grpc_security.h +++ b/include/grpc/grpc_security.h @@ -19,6 +19,8 @@ #ifndef GRPC_GRPC_SECURITY_H #define GRPC_GRPC_SECURITY_H +#include + #include #include #include diff --git a/include/grpc/impl/codegen/byte_buffer.h b/include/grpc/impl/codegen/byte_buffer.h index f8dfbd1d7dc..774655ed66f 100644 --- a/include/grpc/impl/codegen/byte_buffer.h +++ b/include/grpc/impl/codegen/byte_buffer.h @@ -19,6 +19,8 @@ #ifndef GRPC_IMPL_CODEGEN_BYTE_BUFFER_H #define GRPC_IMPL_CODEGEN_BYTE_BUFFER_H +#include + #include #ifdef __cplusplus diff --git a/include/grpc/impl/codegen/sync.h b/include/grpc/impl/codegen/sync.h index 6cdb0c5153d..3df68c644f7 100644 --- a/include/grpc/impl/codegen/sync.h +++ b/include/grpc/impl/codegen/sync.h @@ -43,6 +43,7 @@ extern "C" { /* Platform-specific type declarations of gpr_mu and gpr_cv. */ #include + #include #if defined(GPR_POSIX_SYNC) diff --git a/include/grpc/impl/codegen/sync_custom.h b/include/grpc/impl/codegen/sync_custom.h index 0840ad26bfa..69b1bf6cd19 100644 --- a/include/grpc/impl/codegen/sync_custom.h +++ b/include/grpc/impl/codegen/sync_custom.h @@ -19,6 +19,8 @@ #ifndef GRPC_IMPL_CODEGEN_SYNC_CUSTOM_H #define GRPC_IMPL_CODEGEN_SYNC_CUSTOM_H +#include + #include /* Users defining GPR_CUSTOM_SYNC need to define the following macros. */ diff --git a/include/grpc/impl/codegen/sync_generic.h b/include/grpc/impl/codegen/sync_generic.h index 83f905e120f..d64db58a842 100644 --- a/include/grpc/impl/codegen/sync_generic.h +++ b/include/grpc/impl/codegen/sync_generic.h @@ -20,6 +20,8 @@ #define GRPC_IMPL_CODEGEN_SYNC_GENERIC_H /* Generic type defintions for gpr_sync. */ +#include + #include /* gpr_event */ diff --git a/include/grpc/impl/codegen/sync_posix.h b/include/grpc/impl/codegen/sync_posix.h index 6a3aed92c19..d927046c53e 100644 --- a/include/grpc/impl/codegen/sync_posix.h +++ b/include/grpc/impl/codegen/sync_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_IMPL_CODEGEN_SYNC_POSIX_H #define GRPC_IMPL_CODEGEN_SYNC_POSIX_H +#include + #include #include diff --git a/include/grpc/impl/codegen/sync_windows.h b/include/grpc/impl/codegen/sync_windows.h index 39b127603d8..ba5d5aede0f 100644 --- a/include/grpc/impl/codegen/sync_windows.h +++ b/include/grpc/impl/codegen/sync_windows.h @@ -19,6 +19,8 @@ #ifndef GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H #define GRPC_IMPL_CODEGEN_SYNC_WINDOWS_H +#include + #include typedef struct { diff --git a/include/grpc/slice.h b/include/grpc/slice.h index 10b6a624b32..ce482922afa 100644 --- a/include/grpc/slice.h +++ b/include/grpc/slice.h @@ -19,6 +19,8 @@ #ifndef GRPC_SLICE_H #define GRPC_SLICE_H +#include + #include #include diff --git a/include/grpc/slice_buffer.h b/include/grpc/slice_buffer.h index 30833d02dbf..3260019ca79 100644 --- a/include/grpc/slice_buffer.h +++ b/include/grpc/slice_buffer.h @@ -19,6 +19,8 @@ #ifndef GRPC_SLICE_BUFFER_H #define GRPC_SLICE_BUFFER_H +#include + #include #ifdef __cplusplus diff --git a/include/grpc/status.h b/include/grpc/status.h index 9d8f50bc02c..ecb9668bbb8 100644 --- a/include/grpc/status.h +++ b/include/grpc/status.h @@ -19,6 +19,8 @@ #ifndef GRPC_STATUS_H #define GRPC_STATUS_H +#include + #include #endif /* GRPC_STATUS_H */ diff --git a/include/grpc/support/alloc.h b/include/grpc/support/alloc.h index 577d4f00690..8bd940bec47 100644 --- a/include/grpc/support/alloc.h +++ b/include/grpc/support/alloc.h @@ -19,9 +19,9 @@ #ifndef GRPC_SUPPORT_ALLOC_H #define GRPC_SUPPORT_ALLOC_H -#include +#include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/grpc/support/atm.h b/include/grpc/support/atm.h index b3afa520a0d..073b0a6fcf1 100644 --- a/include/grpc/support/atm.h +++ b/include/grpc/support/atm.h @@ -19,6 +19,8 @@ #ifndef GRPC_SUPPORT_ATM_H #define GRPC_SUPPORT_ATM_H +#include + #include #endif /* GRPC_SUPPORT_ATM_H */ diff --git a/include/grpc/support/atm_gcc_atomic.h b/include/grpc/support/atm_gcc_atomic.h index e7b5ec402f0..ae603db497a 100644 --- a/include/grpc/support/atm_gcc_atomic.h +++ b/include/grpc/support/atm_gcc_atomic.h @@ -19,6 +19,8 @@ #ifndef GRPC_SUPPORT_ATM_GCC_ATOMIC_H #define GRPC_SUPPORT_ATM_GCC_ATOMIC_H +#include + #include #endif /* GRPC_SUPPORT_ATM_GCC_ATOMIC_H */ diff --git a/include/grpc/support/atm_gcc_sync.h b/include/grpc/support/atm_gcc_sync.h index 72848977068..6f51fdb1aa1 100644 --- a/include/grpc/support/atm_gcc_sync.h +++ b/include/grpc/support/atm_gcc_sync.h @@ -19,6 +19,8 @@ #ifndef GRPC_SUPPORT_ATM_GCC_SYNC_H #define GRPC_SUPPORT_ATM_GCC_SYNC_H +#include + #include #endif /* GRPC_SUPPORT_ATM_GCC_SYNC_H */ diff --git a/include/grpc/support/atm_windows.h b/include/grpc/support/atm_windows.h index 554c59a8304..36955e4dae0 100644 --- a/include/grpc/support/atm_windows.h +++ b/include/grpc/support/atm_windows.h @@ -19,6 +19,8 @@ #ifndef GRPC_SUPPORT_ATM_WINDOWS_H #define GRPC_SUPPORT_ATM_WINDOWS_H +#include + #include #endif /* GRPC_SUPPORT_ATM_WINDOWS_H */ diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h index 658e2515459..ccb4b304cc2 100644 --- a/include/grpc/support/log.h +++ b/include/grpc/support/log.h @@ -20,6 +20,7 @@ #define GRPC_SUPPORT_LOG_H #include + #include #include #include /* for abort() */ diff --git a/include/grpc/support/sync.h b/include/grpc/support/sync.h index 75192673a6f..91d1fa79b5d 100644 --- a/include/grpc/support/sync.h +++ b/include/grpc/support/sync.h @@ -19,6 +19,8 @@ #ifndef GRPC_SUPPORT_SYNC_H #define GRPC_SUPPORT_SYNC_H +#include + #include /* for gpr_timespec */ #include diff --git a/include/grpc/support/sync_custom.h b/include/grpc/support/sync_custom.h index b575f5e0028..27cf0e0578d 100644 --- a/include/grpc/support/sync_custom.h +++ b/include/grpc/support/sync_custom.h @@ -19,6 +19,8 @@ #ifndef GRPC_SUPPORT_SYNC_CUSTOM_H #define GRPC_SUPPORT_SYNC_CUSTOM_H +#include + #include #endif /* GRPC_SUPPORT_SYNC_CUSTOM_H */ diff --git a/include/grpc/support/sync_generic.h b/include/grpc/support/sync_generic.h index 970b7a5d9fc..93028c4af05 100644 --- a/include/grpc/support/sync_generic.h +++ b/include/grpc/support/sync_generic.h @@ -19,6 +19,8 @@ #ifndef GRPC_SUPPORT_SYNC_GENERIC_H #define GRPC_SUPPORT_SYNC_GENERIC_H +#include + #include #endif /* GRPC_SUPPORT_SYNC_GENERIC_H */ diff --git a/include/grpc/support/sync_posix.h b/include/grpc/support/sync_posix.h index 482a6004eec..3dce7ee48cc 100644 --- a/include/grpc/support/sync_posix.h +++ b/include/grpc/support/sync_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_SUPPORT_SYNC_POSIX_H #define GRPC_SUPPORT_SYNC_POSIX_H +#include + #include #endif /* GRPC_SUPPORT_SYNC_POSIX_H */ diff --git a/include/grpc/support/sync_windows.h b/include/grpc/support/sync_windows.h index 90ce8b77653..a493c864220 100644 --- a/include/grpc/support/sync_windows.h +++ b/include/grpc/support/sync_windows.h @@ -19,6 +19,8 @@ #ifndef GRPC_SUPPORT_SYNC_WINDOWS_H #define GRPC_SUPPORT_SYNC_WINDOWS_H +#include + #include #endif /* GRPC_SUPPORT_SYNC_WINDOWS_H */ diff --git a/include/grpc/support/time.h b/include/grpc/support/time.h index 62d354aafe8..550ffc2c209 100644 --- a/include/grpc/support/time.h +++ b/include/grpc/support/time.h @@ -19,6 +19,8 @@ #ifndef GRPC_SUPPORT_TIME_H #define GRPC_SUPPORT_TIME_H +#include + #include #include diff --git a/src/core/ext/census/grpc_context.cc b/src/core/ext/census/grpc_context.cc index 069e8f14864..599a798ddaa 100644 --- a/src/core/ext/census/grpc_context.cc +++ b/src/core/ext/census/grpc_context.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include "src/core/lib/surface/api_trace.h" diff --git a/src/core/ext/filters/client_channel/backup_poller.cc b/src/core/ext/filters/client_channel/backup_poller.cc index ee90b499ebd..e7d72d1fde2 100644 --- a/src/core/ext/filters/client_channel/backup_poller.cc +++ b/src/core/ext/filters/client_channel/backup_poller.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/backup_poller.h" #include diff --git a/src/core/ext/filters/client_channel/backup_poller.h b/src/core/ext/filters/client_channel/backup_poller.h index 551e0331dcf..45bdf10d6c4 100644 --- a/src/core/ext/filters/client_channel/backup_poller.h +++ b/src/core/ext/filters/client_channel/backup_poller.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKUP_POLLER_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_BACKUP_POLLER_H +#include + #include #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/filters/client_channel/channel_connectivity.cc b/src/core/ext/filters/client_channel/channel_connectivity.cc index 31a5c311246..37860e82e32 100644 --- a/src/core/ext/filters/client_channel/channel_connectivity.cc +++ b/src/core/ext/filters/client_channel/channel_connectivity.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/surface/channel.h" #include diff --git a/src/core/ext/filters/client_channel/client_channel.h b/src/core/ext/filters/client_channel/client_channel.h index 9670405cbe8..a21e5623a7b 100644 --- a/src/core/ext/filters/client_channel/client_channel.h +++ b/src/core/ext/filters/client_channel/client_channel.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H +#include + #include "src/core/ext/filters/client_channel/client_channel_factory.h" #include "src/core/ext/filters/client_channel/resolver.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/ext/filters/client_channel/client_channel_factory.cc b/src/core/ext/filters/client_channel/client_channel_factory.cc index 3baf5b31ab3..172e9f03c73 100644 --- a/src/core/ext/filters/client_channel/client_channel_factory.cc +++ b/src/core/ext/filters/client_channel/client_channel_factory.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/client_channel_factory.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/filters/client_channel/client_channel_factory.h b/src/core/ext/filters/client_channel/client_channel_factory.h index 766ebb9389d..601ec46b2a5 100644 --- a/src/core/ext/filters/client_channel/client_channel_factory.h +++ b/src/core/ext/filters/client_channel/client_channel_factory.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H +#include + #include #include "src/core/ext/filters/client_channel/subchannel.h" diff --git a/src/core/ext/filters/client_channel/connector.cc b/src/core/ext/filters/client_channel/connector.cc index c8bf2f3e1c0..5e04b3b4539 100644 --- a/src/core/ext/filters/client_channel/connector.cc +++ b/src/core/ext/filters/client_channel/connector.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/connector.h" grpc_connector* grpc_connector_ref(grpc_connector* connector) { diff --git a/src/core/ext/filters/client_channel/connector.h b/src/core/ext/filters/client_channel/connector.h index d657658d671..556594929c1 100644 --- a/src/core/ext/filters/client_channel/connector.h +++ b/src/core/ext/filters/client_channel/connector.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONNECTOR_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CONNECTOR_H +#include + #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/ext/filters/client_channel/http_connect_handshaker.cc b/src/core/ext/filters/client_channel/http_connect_handshaker.cc index 248a6347d51..fb29fa788d0 100644 --- a/src/core/ext/filters/client_channel/http_connect_handshaker.cc +++ b/src/core/ext/filters/client_channel/http_connect_handshaker.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/http_connect_handshaker.h" #include diff --git a/src/core/ext/filters/client_channel/http_proxy.cc b/src/core/ext/filters/client_channel/http_proxy.cc index d42376413d0..29a6c0e3677 100644 --- a/src/core/ext/filters/client_channel/http_proxy.cc +++ b/src/core/ext/filters/client_channel/http_proxy.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/http_proxy.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy.cc b/src/core/ext/filters/client_channel/lb_policy.cc index 59f4cdafb34..fa63dd75b5c 100644 --- a/src/core/ext/filters/client_channel/lb_policy.cc +++ b/src/core/ext/filters/client_channel/lb_policy.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/lb_policy.h" #include "src/core/lib/iomgr/combiner.h" diff --git a/src/core/ext/filters/client_channel/lb_policy.h b/src/core/ext/filters/client_channel/lb_policy.h index 6de652747e7..c3e43e5ef65 100644 --- a/src/core/ext/filters/client_channel/lb_policy.h +++ b/src/core/ext/filters/client_channel/lb_policy.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_H +#include + #include "src/core/ext/filters/client_channel/client_channel_factory.h" #include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/lib/gprpp/abstract.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc index 1a3a1f029c3..18ef1f6ff55 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h index 04de7a04df6..838e2ef1cae 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H +#include + #include "src/core/lib/channel/channel_stack.h" extern const grpc_channel_filter grpc_client_load_reporting_filter; diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index e38211fbf43..7c0e33ff0ac 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -58,6 +58,8 @@ // using that endpoint. Because of various transitive includes in uv.h, // including windows.h on Windows, uv.h must be included before other system // headers. Therefore, sockaddr.h must always be included first. +#include + #include "src/core/lib/iomgr/sockaddr.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc index ebbe597d29e..fd873f096d8 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" grpc_channel_args* grpc_lb_policy_grpclb_modify_lb_channel_args( diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h index 6635010434c..825065a9c32 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_CHANNEL_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_CHANNEL_H +#include + #include "src/core/ext/filters/client_channel/lb_policy_factory.h" /// Makes any necessary modifications to \a args for use in the grpclb diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc index 254a5dfd16d..7abd7f37f9a 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc index 0b5a798be32..dfbaead7d5c 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h index d4b9d068488..c971e568833 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_CLIENT_STATS_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_GRPCLB_CLIENT_STATS_H +#include + #include #include diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc index c388b6ba77d..7ef3bcf24fd 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" #include "third_party/nanopb/pb_decode.h" #include "third_party/nanopb/pb_encode.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h index ccb0212643a..d4270f2536a 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_LOAD_BALANCER_API_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_LOAD_BALANCER_API_H +#include + #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc index f1878a594e9..818b93c882e 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index 178e299b616..7ef7b0f6fc0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -24,6 +24,8 @@ * updates. Note however that updates will start picking from the beginning of * the updated list. */ +#include + #include #include diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc index f1580e8b91f..79cb64c6c60 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h index 7a8f5f10296..6889d596ac9 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_SUBCHANNEL_LIST_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_SUBCHANNEL_LIST_H +#include + #include "src/core/ext/filters/client_channel/lb_policy_registry.h" #include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/ext/filters/client_channel/lb_policy_factory.cc b/src/core/ext/filters/client_channel/lb_policy_factory.cc index 2018aabb910..80646a10cc9 100644 --- a/src/core/ext/filters/client_channel/lb_policy_factory.cc +++ b/src/core/ext/filters/client_channel/lb_policy_factory.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/ext/filters/client_channel/lb_policy_factory.h b/src/core/ext/filters/client_channel/lb_policy_factory.h index e0e7d8bf5ca..b8bbd320721 100644 --- a/src/core/ext/filters/client_channel/lb_policy_factory.h +++ b/src/core/ext/filters/client_channel/lb_policy_factory.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_FACTORY_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_FACTORY_H +#include + #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.cc b/src/core/ext/filters/client_channel/lb_policy_registry.cc index f495cdb3c2a..d651b1120d3 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.cc +++ b/src/core/ext/filters/client_channel/lb_policy_registry.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/lb_policy_registry.h" #include diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.h b/src/core/ext/filters/client_channel/lb_policy_registry.h index 14c21dfe632..2283d848bdd 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.h +++ b/src/core/ext/filters/client_channel/lb_policy_registry.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_REGISTRY_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_REGISTRY_H +#include + #include "src/core/ext/filters/client_channel/lb_policy_factory.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/ext/filters/client_channel/parse_address.cc b/src/core/ext/filters/client_channel/parse_address.cc index 473c7542df3..e78dc99e0b3 100644 --- a/src/core/ext/filters/client_channel/parse_address.cc +++ b/src/core/ext/filters/client_channel/parse_address.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/src/core/ext/filters/client_channel/parse_address.h b/src/core/ext/filters/client_channel/parse_address.h index ca0a0d18f03..9a88b66edcf 100644 --- a/src/core/ext/filters/client_channel/parse_address.h +++ b/src/core/ext/filters/client_channel/parse_address.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PARSE_ADDRESS_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PARSE_ADDRESS_H +#include + #include #include "src/core/ext/filters/client_channel/uri_parser.h" diff --git a/src/core/ext/filters/client_channel/proxy_mapper.cc b/src/core/ext/filters/client_channel/proxy_mapper.cc index be85cfcced9..c4da06778d2 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper.cc +++ b/src/core/ext/filters/client_channel/proxy_mapper.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/proxy_mapper.h" void grpc_proxy_mapper_init(const grpc_proxy_mapper_vtable* vtable, diff --git a/src/core/ext/filters/client_channel/proxy_mapper.h b/src/core/ext/filters/client_channel/proxy_mapper.h index ce3e65ee466..634b0ed7bf5 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper.h +++ b/src/core/ext/filters/client_channel/proxy_mapper.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PROXY_MAPPER_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PROXY_MAPPER_H +#include + #include #include diff --git a/src/core/ext/filters/client_channel/proxy_mapper_registry.cc b/src/core/ext/filters/client_channel/proxy_mapper_registry.cc index b42597e363a..a02a5f5e2cd 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper_registry.cc +++ b/src/core/ext/filters/client_channel/proxy_mapper_registry.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/proxy_mapper_registry.h" #include diff --git a/src/core/ext/filters/client_channel/proxy_mapper_registry.h b/src/core/ext/filters/client_channel/proxy_mapper_registry.h index 2ad6c04e1d1..326b582b993 100644 --- a/src/core/ext/filters/client_channel/proxy_mapper_registry.h +++ b/src/core/ext/filters/client_channel/proxy_mapper_registry.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PROXY_MAPPER_REGISTRY_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PROXY_MAPPER_REGISTRY_H +#include + #include "src/core/ext/filters/client_channel/proxy_mapper.h" void grpc_proxy_mapper_registry_init(); diff --git a/src/core/ext/filters/client_channel/resolver.cc b/src/core/ext/filters/client_channel/resolver.cc index 860c2eea1e3..cd11eeb9e4d 100644 --- a/src/core/ext/filters/client_channel/resolver.cc +++ b/src/core/ext/filters/client_channel/resolver.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/resolver.h" #include "src/core/lib/iomgr/combiner.h" diff --git a/src/core/ext/filters/client_channel/resolver.h b/src/core/ext/filters/client_channel/resolver.h index 62fcb49a41b..1685a6c8031 100644 --- a/src/core/ext/filters/client_channel/resolver.h +++ b/src/core/ext/filters/client_channel/resolver.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_H +#include + #include #include "src/core/lib/gprpp/abstract.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 0442b1e4962..a24e8ff3528 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -17,6 +17,7 @@ */ #include + #if GRPC_ARES == 1 && !defined(GRPC_UV) #include diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h index ba7dad63cfa..0bc13e35f48 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -19,6 +19,8 @@ #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 +#include + #include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index 10bc8f60741..b604f2bf147 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -16,6 +16,7 @@ * */ #include + #include "src/core/lib/iomgr/port.h" #if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET) diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index 82b55456017..71b06eb87e2 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -17,6 +17,7 @@ */ #include + #if GRPC_ARES == 1 && !defined(GRPC_UV) #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h index 86d870e0a6d..bda9cd17295 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H +#include + #include "src/core/ext/filters/client_channel/lb_policy_factory.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc index a184cf2d57d..5096e480bc7 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc @@ -17,6 +17,7 @@ */ #include + #if GRPC_ARES != 1 || defined(GRPC_UV) #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index b01e608c3f9..4d8958f5191 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -17,6 +17,8 @@ // This is similar to the sockaddr resolver, except that it supports a // bunch of query args that are useful for dependency injection in tests. +#include + #include #include #include @@ -24,7 +26,6 @@ #include #include -#include #include #include "src/core/ext/filters/client_channel/lb_policy_factory.h" diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h index d42811d9131..858f35851d0 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h @@ -17,6 +17,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FAKE_FAKE_RESOLVER_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FAKE_FAKE_RESOLVER_H +#include + #include "src/core/ext/filters/client_channel/lb_policy_factory.h" #include "src/core/ext/filters/client_channel/uri_parser.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc index 966b9fd3f2c..f74ac5aebe5 100644 --- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc @@ -16,13 +16,14 @@ * */ +#include + #include #include #include #include #include -#include #include #include "src/core/ext/filters/client_channel/lb_policy_factory.h" diff --git a/src/core/ext/filters/client_channel/resolver_factory.h b/src/core/ext/filters/client_channel/resolver_factory.h index f9b95012369..ee3cfeeb9bf 100644 --- a/src/core/ext/filters/client_channel/resolver_factory.h +++ b/src/core/ext/filters/client_channel/resolver_factory.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FACTORY_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FACTORY_H +#include + #include #include "src/core/ext/filters/client_channel/resolver.h" diff --git a/src/core/ext/filters/client_channel/resolver_registry.cc b/src/core/ext/filters/client_channel/resolver_registry.cc index 036e81d0ae4..91c0267f95e 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.cc +++ b/src/core/ext/filters/client_channel/resolver_registry.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/resolver_registry.h" #include diff --git a/src/core/ext/filters/client_channel/resolver_registry.h b/src/core/ext/filters/client_channel/resolver_registry.h index 260336de83d..d6ec6811bd7 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.h +++ b/src/core/ext/filters/client_channel/resolver_registry.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_REGISTRY_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_REGISTRY_H +#include + #include "src/core/ext/filters/client_channel/resolver_factory.h" #include "src/core/lib/gprpp/inlined_vector.h" #include "src/core/lib/gprpp/memory.h" diff --git a/src/core/ext/filters/client_channel/retry_throttle.cc b/src/core/ext/filters/client_channel/retry_throttle.cc index a98e27860a7..450a332342a 100644 --- a/src/core/ext/filters/client_channel/retry_throttle.cc +++ b/src/core/ext/filters/client_channel/retry_throttle.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/retry_throttle.h" #include diff --git a/src/core/ext/filters/client_channel/retry_throttle.h b/src/core/ext/filters/client_channel/retry_throttle.h index bf99297e988..0505fc27f25 100644 --- a/src/core/ext/filters/client_channel/retry_throttle.h +++ b/src/core/ext/filters/client_channel/retry_throttle.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_THROTTLE_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_THROTTLE_H +#include + #include /// Tracks retry throttling data for an individual server name. diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index fbe07c58f7b..1304b4a6ad3 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/subchannel.h" #include diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index d2b45ae9c85..7f997d9924c 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_H +#include + #include "src/core/ext/filters/client_channel/connector.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/gpr/arena.h" diff --git a/src/core/ext/filters/client_channel/subchannel_index.cc b/src/core/ext/filters/client_channel/subchannel_index.cc index d1dc5ee970b..cb02b1a7480 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.cc +++ b/src/core/ext/filters/client_channel/subchannel_index.cc @@ -16,6 +16,8 @@ // // +#include + #include "src/core/ext/filters/client_channel/subchannel_index.h" #include diff --git a/src/core/ext/filters/client_channel/subchannel_index.h b/src/core/ext/filters/client_channel/subchannel_index.h index bd160a3b133..a7dae9d47d3 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.h +++ b/src/core/ext/filters/client_channel/subchannel_index.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_INDEX_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SUBCHANNEL_INDEX_H +#include + #include "src/core/ext/filters/client_channel/subchannel.h" /** \file Provides an index of active subchannels so that they can be diff --git a/src/core/ext/filters/client_channel/uri_parser.cc b/src/core/ext/filters/client_channel/uri_parser.cc index cd07a6fbf5a..0572034a9ce 100644 --- a/src/core/ext/filters/client_channel/uri_parser.cc +++ b/src/core/ext/filters/client_channel/uri_parser.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/client_channel/uri_parser.h" #include @@ -23,7 +25,6 @@ #include #include #include -#include #include #include "src/core/lib/gpr/string.h" diff --git a/src/core/ext/filters/client_channel/uri_parser.h b/src/core/ext/filters/client_channel/uri_parser.h index 24ff06c0b5a..1966da932b0 100644 --- a/src/core/ext/filters/client_channel/uri_parser.h +++ b/src/core/ext/filters/client_channel/uri_parser.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_URI_PARSER_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_URI_PARSER_H +#include + #include #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/filters/deadline/deadline_filter.cc b/src/core/ext/filters/deadline/deadline_filter.cc index 76c1204090a..dda3b61108b 100644 --- a/src/core/ext/filters/deadline/deadline_filter.cc +++ b/src/core/ext/filters/deadline/deadline_filter.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include "src/core/ext/filters/deadline/deadline_filter.h" #include diff --git a/src/core/ext/filters/deadline/deadline_filter.h b/src/core/ext/filters/deadline/deadline_filter.h index 4de817ef54a..13207cbd6fb 100644 --- a/src/core/ext/filters/deadline/deadline_filter.h +++ b/src/core/ext/filters/deadline/deadline_filter.h @@ -17,6 +17,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_DEADLINE_DEADLINE_FILTER_H #define GRPC_CORE_EXT_FILTERS_DEADLINE_DEADLINE_FILTER_H +#include + #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/iomgr/timer.h" diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc index 80643f8584c..58aefd17c75 100644 --- a/src/core/ext/filters/http/client/http_client_filter.cc +++ b/src/core/ext/filters/http/client/http_client_filter.cc @@ -15,11 +15,13 @@ * */ -#include "src/core/ext/filters/http/client/http_client_filter.h" +#include + #include #include #include #include +#include "src/core/ext/filters/http/client/http_client_filter.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/profiling/timers.h" #include "src/core/lib/slice/b64.h" diff --git a/src/core/ext/filters/http/client/http_client_filter.h b/src/core/ext/filters/http/client/http_client_filter.h index ec8177c4367..b7cef33f5c7 100644 --- a/src/core/ext/filters/http/client/http_client_filter.h +++ b/src/core/ext/filters/http/client/http_client_filter.h @@ -18,6 +18,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_HTTP_CLIENT_HTTP_CLIENT_FILTER_H #define GRPC_CORE_EXT_FILTERS_HTTP_CLIENT_HTTP_CLIENT_FILTER_H +#include + #include "src/core/lib/channel/channel_stack.h" /* Processes metadata on the client side for HTTP2 transports */ diff --git a/src/core/ext/filters/http/http_filters_plugin.cc b/src/core/ext/filters/http/http_filters_plugin.cc index 56fe1e5c242..f03fa0141df 100644 --- a/src/core/ext/filters/http/http_filters_plugin.cc +++ b/src/core/ext/filters/http/http_filters_plugin.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include "src/core/ext/filters/http/client/http_client_filter.h" diff --git a/src/core/ext/filters/http/message_compress/message_compress_filter.cc b/src/core/ext/filters/http/message_compress/message_compress_filter.cc index 73220a0ea14..efe0085c5b0 100644 --- a/src/core/ext/filters/http/message_compress/message_compress_filter.cc +++ b/src/core/ext/filters/http/message_compress/message_compress_filter.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/ext/filters/http/message_compress/message_compress_filter.h b/src/core/ext/filters/http/message_compress/message_compress_filter.h index 62207911c70..e163e3cf98f 100644 --- a/src/core/ext/filters/http/message_compress/message_compress_filter.h +++ b/src/core/ext/filters/http/message_compress/message_compress_filter.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_MESSAGE_COMPRESS_FILTER_H #define GRPC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_MESSAGE_COMPRESS_FILTER_H +#include + #include #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc index aeb0c39df92..57ec8dce34d 100644 --- a/src/core/ext/filters/http/server/http_server_filter.cc +++ b/src/core/ext/filters/http/server/http_server_filter.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/http/server/http_server_filter.h" #include diff --git a/src/core/ext/filters/http/server/http_server_filter.h b/src/core/ext/filters/http/server/http_server_filter.h index c0f678a3299..4eb130b1fd1 100644 --- a/src/core/ext/filters/http/server/http_server_filter.h +++ b/src/core/ext/filters/http/server/http_server_filter.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_HTTP_SERVER_HTTP_SERVER_FILTER_H #define GRPC_CORE_EXT_FILTERS_HTTP_SERVER_HTTP_SERVER_FILTER_H +#include + #include "src/core/lib/channel/channel_stack.h" /* Processes metadata on the client side for HTTP2 transports */ diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 79b144a6eb3..0d349e2a894 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.h b/src/core/ext/filters/load_reporting/server_load_reporting_filter.h index 1baee5e7cd6..b459a8ec5f5 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.h +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_LOAD_REPORTING_SERVER_LOAD_REPORTING_FILTER_H #define GRPC_CORE_EXT_FILTERS_LOAD_REPORTING_SERVER_LOAD_REPORTING_FILTER_H +#include + #include "src/core/ext/filters/load_reporting/server_load_reporting_plugin.h" #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_plugin.h b/src/core/ext/filters/load_reporting/server_load_reporting_plugin.h index 4b694d336de..c20aaa744f9 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_plugin.h +++ b/src/core/ext/filters/load_reporting/server_load_reporting_plugin.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_LOAD_REPORTING_SERVER_LOAD_REPORTING_PLUGIN_H #define GRPC_CORE_EXT_FILTERS_LOAD_REPORTING_SERVER_LOAD_REPORTING_PLUGIN_H +#include + #include #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/ext/filters/max_age/max_age_filter.cc b/src/core/ext/filters/max_age/max_age_filter.cc index abb9d69036b..acb1d66fa80 100644 --- a/src/core/ext/filters/max_age/max_age_filter.cc +++ b/src/core/ext/filters/max_age/max_age_filter.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/filters/max_age/max_age_filter.h" #include diff --git a/src/core/ext/filters/max_age/max_age_filter.h b/src/core/ext/filters/max_age/max_age_filter.h index 68fb4a4ca57..989322244f7 100644 --- a/src/core/ext/filters/max_age/max_age_filter.h +++ b/src/core/ext/filters/max_age/max_age_filter.h @@ -17,6 +17,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_MAX_AGE_MAX_AGE_FILTER_H #define GRPC_CORE_EXT_FILTERS_MAX_AGE_MAX_AGE_FILTER_H +#include + #include "src/core/lib/channel/channel_stack.h" extern const grpc_channel_filter grpc_max_age_filter; diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index 0fb39356090..63a9e566d3b 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include "src/core/ext/filters/message_size/message_size_filter.h" #include diff --git a/src/core/ext/filters/message_size/message_size_filter.h b/src/core/ext/filters/message_size/message_size_filter.h index d3667f70037..f66636e5832 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/src/core/ext/filters/message_size/message_size_filter.h @@ -17,6 +17,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H #define GRPC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H +#include + #include "src/core/lib/channel/channel_stack.h" extern const grpc_channel_filter grpc_message_size_filter; diff --git a/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc b/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc index 3092ed20564..bed1004c576 100644 --- a/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +++ b/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include "src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h" #include diff --git a/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h b/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h index 9dae4f07342..94d20f0c4ac 100644 --- a/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h +++ b/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h @@ -17,6 +17,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_WORKAROUNDS_WORKAROUND_CRONET_COMPRESSION_FILTER_H #define GRPC_CORE_EXT_FILTERS_WORKAROUNDS_WORKAROUND_CRONET_COMPRESSION_FILTER_H +#include + #include "src/core/lib/channel/channel_stack.h" extern const grpc_channel_filter grpc_workaround_cronet_compression_filter; diff --git a/src/core/ext/filters/workarounds/workaround_utils.cc b/src/core/ext/filters/workarounds/workaround_utils.cc index 850ed75ec94..4dabe896d3b 100644 --- a/src/core/ext/filters/workarounds/workaround_utils.cc +++ b/src/core/ext/filters/workarounds/workaround_utils.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include "src/core/ext/filters/workarounds/workaround_utils.h" #include diff --git a/src/core/ext/filters/workarounds/workaround_utils.h b/src/core/ext/filters/workarounds/workaround_utils.h index d6ef5e84fa5..f172ccc0788 100644 --- a/src/core/ext/filters/workarounds/workaround_utils.h +++ b/src/core/ext/filters/workarounds/workaround_utils.h @@ -17,6 +17,8 @@ #ifndef GRPC_CORE_EXT_FILTERS_WORKAROUNDS_WORKAROUND_UTILS_H #define GRPC_CORE_EXT_FILTERS_WORKAROUNDS_WORKAROUND_UTILS_H +#include + #include #include "src/core/lib/transport/metadata.h" diff --git a/src/core/ext/transport/chttp2/alpn/alpn.cc b/src/core/ext/transport/chttp2/alpn/alpn.cc index 5c4bfd03fa0..1fdab76dbf0 100644 --- a/src/core/ext/transport/chttp2/alpn/alpn.cc +++ b/src/core/ext/transport/chttp2/alpn/alpn.cc @@ -16,8 +16,10 @@ * */ -#include "src/core/ext/transport/chttp2/alpn/alpn.h" +#include + #include +#include "src/core/ext/transport/chttp2/alpn/alpn.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/ext/transport/chttp2/alpn/alpn.h b/src/core/ext/transport/chttp2/alpn/alpn.h index fd7513c6654..0042eafd95a 100644 --- a/src/core/ext/transport/chttp2/alpn/alpn.h +++ b/src/core/ext/transport/chttp2/alpn/alpn.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H +#include + #include /* Retuns 1 if the version is supported, 0 otherwise. */ diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 7eb9ebc27e8..e7522ffba87 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/client/chttp2_connector.h" #include diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h index e258892cfc7..04da4413095 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H +#include + #include "src/core/ext/filters/client_channel/connector.h" grpc_connector* grpc_chttp2_connector_create(); diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index ef1d3fb53bf..60800365b81 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc index 0cdea5a94e8..479f0da5726 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc @@ -16,10 +16,11 @@ * */ +#include + #include #include #include -#include #ifdef GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index f3cc16d8ccd..dcfcd243a92 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 90b2ee1af96..687cc483f62 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/server/chttp2_server.h" #include diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h index 7de859da420..7b419721606 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.h +++ b/src/core/ext/transport/chttp2/server/chttp2_server.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H +#include + #include #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc index 52c42d056c6..822236dd2d7 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc index dafd4af6cef..371e463814c 100644 --- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc @@ -16,10 +16,11 @@ * */ +#include + #include #include #include -#include #ifdef GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc index 723af97ff08..6689a17da63 100644 --- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/src/core/ext/transport/chttp2/transport/bin_decoder.cc index 831a36961eb..f0f32da0287 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.cc @@ -16,9 +16,11 @@ * */ -#include "src/core/ext/transport/chttp2/transport/bin_decoder.h" +#include + #include #include +#include "src/core/ext/transport/chttp2/transport/bin_decoder.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.h b/src/core/ext/transport/chttp2/transport/bin_decoder.h index a0d74fb20d8..8a4d4a71790 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H +#include + #include #include diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.cc b/src/core/ext/transport/chttp2/transport/bin_encoder.cc index e3b8adbe735..bad29e3421c 100644 --- a/src/core/ext/transport/chttp2/transport/bin_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.h b/src/core/ext/transport/chttp2/transport/bin_encoder.h index 93ad0dfdea2..1b7bb1574af 100644 --- a/src/core/ext/transport/chttp2/transport/bin_encoder.h +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H +#include + #include /* base64 encode a slice. Returns a new slice, does not take ownership of the diff --git a/src/core/ext/transport/chttp2/transport/chttp2_plugin.cc b/src/core/ext/transport/chttp2/transport/chttp2_plugin.cc index a69908116ab..531ea73e9e6 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_plugin.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_plugin.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/env.h" diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 2fc3c4fa41d..89115b66ed8 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -16,10 +16,10 @@ * */ -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" - #include +#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" + #include #include #include diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index 34519ceec9c..9d55b3f4b0d 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H +#include + #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index 45b6f97b054..e89c363200e 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h index b58027790d5..120fefc8b79 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/src/core/ext/transport/chttp2/transport/flow_control.h @@ -20,6 +20,7 @@ #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FLOW_CONTROL_H #include + #include #include "src/core/ext/transport/chttp2/transport/http2_settings.h" diff --git a/src/core/ext/transport/chttp2/transport/frame.h b/src/core/ext/transport/chttp2/transport/frame.h index dba4c004eca..083c0076e71 100644 --- a/src/core/ext/transport/chttp2/transport/frame.h +++ b/src/core/ext/transport/chttp2/transport/frame.h @@ -19,9 +19,10 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_H -#include #include +#include + #include "src/core/lib/iomgr/error.h" /* defined in internal.h */ diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index 721f0a55a12..0d37a494a23 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/frame_data.h" #include diff --git a/src/core/ext/transport/chttp2/transport/frame_data.h b/src/core/ext/transport/chttp2/transport/frame_data.h index 964cc59b1bd..3efbbf9f76a 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.h +++ b/src/core/ext/transport/chttp2/transport/frame_data.h @@ -21,6 +21,8 @@ /* Parser for GRPC streams embedded in DATA frames */ +#include + #include #include #include "src/core/ext/transport/chttp2/transport/frame.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/src/core/ext/transport/chttp2/transport/frame_goaway.cc index 70931ed22d9..2a1dd3c3163 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.cc +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" #include "src/core/ext/transport/chttp2/transport/internal.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.h b/src/core/ext/transport/chttp2/transport/frame_goaway.h index 064d39ac595..e17ed8d5638 100644 --- a/src/core/ext/transport/chttp2/transport/frame_goaway.h +++ b/src/core/ext/transport/chttp2/transport/frame_goaway.h @@ -19,9 +19,10 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_GOAWAY_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_GOAWAY_H +#include + #include #include -#include #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc index 62294593975..205826b779a 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/frame_ping.h" #include "src/core/ext/transport/chttp2/transport/internal.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.h b/src/core/ext/transport/chttp2/transport/frame_ping.h index 75bacfb1d4f..8718d6a0978 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.h +++ b/src/core/ext/transport/chttp2/transport/frame_ping.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_PING_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_PING_H +#include + #include #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index 79528762e06..4bdd4309a48 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" #include "src/core/ext/transport/chttp2/transport/internal.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h index e76a3ca8415..bb2d34f9183 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_RST_STREAM_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_RST_STREAM_H +#include + #include #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index 737a9382e00..9ea27dcd473 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/frame_settings.h" #include "src/core/ext/transport/chttp2/transport/internal.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index ce654028152..df196271941 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -19,8 +19,9 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SETTINGS_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SETTINGS_H -#include #include + +#include #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc index 95be5b42d2b..4b586dc3e7f 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/frame_window_update.h" #include "src/core/ext/transport/chttp2/transport/internal.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.h b/src/core/ext/transport/chttp2/transport/frame_window_update.h index a32f1a9d11e..30667c77e17 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.h +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H +#include + #include #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 4855455130b..e4f3c1b81e1 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index a26514cab08..b3709321314 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -19,9 +19,10 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_H +#include + #include #include -#include #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 26a38e3f878..fc96a8b3e4d 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/ext/transport/chttp2/transport/internal.h" @@ -25,7 +27,6 @@ #include #include -#include #include #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h index 060bc5ce9d6..b3b8018b987 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -19,9 +19,10 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_H +#include + #include -#include #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/ext/transport/chttp2/transport/hpack_table.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_table.cc b/src/core/ext/transport/chttp2/transport/hpack_table.cc index d7cabbde045..f050f502f5a 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_table.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_table.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/hpack_table.h" #include diff --git a/src/core/ext/transport/chttp2/transport/hpack_table.h b/src/core/ext/transport/chttp2/transport/hpack_table.h index 189ad1c697f..98026a4ba4a 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_table.h @@ -19,8 +19,9 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_TABLE_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_TABLE_H -#include #include + +#include #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/metadata.h" diff --git a/src/core/ext/transport/chttp2/transport/http2_settings.cc b/src/core/ext/transport/chttp2/transport/http2_settings.cc index 745b1656f95..294ee8e4aa8 100644 --- a/src/core/ext/transport/chttp2/transport/http2_settings.cc +++ b/src/core/ext/transport/chttp2/transport/http2_settings.cc @@ -18,6 +18,8 @@ * Automatically generated by tools/codegen/core/gen_settings_ids.py */ +#include + #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/ext/transport/chttp2/transport/http2_settings.h b/src/core/ext/transport/chttp2/transport/http2_settings.h index fd15b6977b9..07ce0621b21 100644 --- a/src/core/ext/transport/chttp2/transport/http2_settings.h +++ b/src/core/ext/transport/chttp2/transport/http2_settings.h @@ -21,6 +21,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H +#include + #include #include diff --git a/src/core/ext/transport/chttp2/transport/huffsyms.cc b/src/core/ext/transport/chttp2/transport/huffsyms.cc index f28d8cc30a7..813e4c91b19 100644 --- a/src/core/ext/transport/chttp2/transport/huffsyms.cc +++ b/src/core/ext/transport/chttp2/transport/huffsyms.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/huffsyms.h" /* Constants pulled from the HPACK spec, and converted to C using the vim diff --git a/src/core/ext/transport/chttp2/transport/incoming_metadata.cc b/src/core/ext/transport/chttp2/transport/incoming_metadata.cc index 18d89f06d89..58d77b932f3 100644 --- a/src/core/ext/transport/chttp2/transport/incoming_metadata.cc +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/incoming_metadata.h" #include diff --git a/src/core/ext/transport/chttp2/transport/incoming_metadata.h b/src/core/ext/transport/chttp2/transport/incoming_metadata.h index b84cd484c4d..d029cf00d46 100644 --- a/src/core/ext/transport/chttp2/transport/incoming_metadata.h +++ b/src/core/ext/transport/chttp2/transport/incoming_metadata.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_INCOMING_METADATA_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_INCOMING_METADATA_H +#include + #include "src/core/lib/transport/transport.h" typedef struct { diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 6b6c0b28e2a..b9431cd311b 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_INTERNAL_H #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_INTERNAL_H +#include + #include #include diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 9357fedb5c9..988380b76c5 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/internal.h" #include diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc index 3aad8c5823c..5d3ec4b53ba 100644 --- a/src/core/ext/transport/chttp2/transport/stream_lists.cc +++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/internal.h" diff --git a/src/core/ext/transport/chttp2/transport/stream_map.cc b/src/core/ext/transport/chttp2/transport/stream_map.cc index a40eaffd5f6..f300e2356c9 100644 --- a/src/core/ext/transport/chttp2/transport/stream_map.cc +++ b/src/core/ext/transport/chttp2/transport/stream_map.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/stream_map.h" #include diff --git a/src/core/ext/transport/chttp2/transport/varint.cc b/src/core/ext/transport/chttp2/transport/varint.cc index 621a8100c73..d4b01788b94 100644 --- a/src/core/ext/transport/chttp2/transport/varint.cc +++ b/src/core/ext/transport/chttp2/transport/varint.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/varint.h" uint32_t grpc_chttp2_hpack_varint_length(uint32_t tail_value) { diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 42cba9ae60a..7471d88aa15 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/chttp2/transport/internal.h" #include diff --git a/src/core/ext/transport/cronet/transport/cronet_api_dummy.cc b/src/core/ext/transport/cronet/transport/cronet_api_dummy.cc index 578cbb8ac6c..1a6bded6afd 100644 --- a/src/core/ext/transport/cronet/transport/cronet_api_dummy.cc +++ b/src/core/ext/transport/cronet/transport/cronet_api_dummy.cc @@ -19,6 +19,8 @@ /* This file has empty implementation of all the functions exposed by the cronet library, so we can build it in all environments */ +#include + #include #include diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index c367f9c465e..ff1c1aad622 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -16,9 +16,10 @@ * */ +#include + #include -#include #include #include #include diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.h b/src/core/ext/transport/cronet/transport/cronet_transport.h index d9ff913326a..fb7e149f10f 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.h +++ b/src/core/ext/transport/cronet/transport/cronet_transport.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_TRANSPORT_H #define GRPC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_TRANSPORT_H +#include + #include "src/core/lib/transport/transport.h" grpc_transport* grpc_create_cronet_transport(void* engine, const char* target, diff --git a/src/core/ext/transport/inproc/inproc_plugin.cc b/src/core/ext/transport/inproc/inproc_plugin.cc index 83a7d8d52f9..8e251fa2d85 100644 --- a/src/core/ext/transport/inproc/inproc_plugin.cc +++ b/src/core/ext/transport/inproc/inproc_plugin.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/ext/transport/inproc/inproc_transport.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index e1d48437859..5f898bbf257 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -16,12 +16,14 @@ * */ -#include "src/core/ext/transport/inproc/inproc_transport.h" +#include + #include #include #include #include #include +#include "src/core/ext/transport/inproc/inproc_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/api_trace.h" diff --git a/src/core/ext/transport/inproc/inproc_transport.h b/src/core/ext/transport/inproc/inproc_transport.h index 7c0453e7ce1..049d1402afe 100644 --- a/src/core/ext/transport/inproc/inproc_transport.h +++ b/src/core/ext/transport/inproc/inproc_transport.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_EXT_TRANSPORT_INPROC_INPROC_TRANSPORT_H #define GRPC_CORE_EXT_TRANSPORT_INPROC_INPROC_TRANSPORT_H +#include + #include "src/core/lib/transport/transport_impl.h" grpc_channel* grpc_inproc_channel_create(grpc_server* server, diff --git a/src/core/lib/avl/avl.cc b/src/core/lib/avl/avl.cc index c674d9be28e..ec106ddb1da 100644 --- a/src/core/lib/avl/avl.cc +++ b/src/core/lib/avl/avl.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/avl/avl.h" #include diff --git a/src/core/lib/avl/avl.h b/src/core/lib/avl/avl.h index df5d2e89ec2..15a9d569471 100644 --- a/src/core/lib/avl/avl.h +++ b/src/core/lib/avl/avl.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_AVL_AVL_H #define GRPC_CORE_LIB_AVL_AVL_H +#include + #include /** internal node of an AVL tree */ diff --git a/src/core/lib/backoff/backoff.cc b/src/core/lib/backoff/backoff.cc index 4b74afc2444..e536abde0a2 100644 --- a/src/core/lib/backoff/backoff.cc +++ b/src/core/lib/backoff/backoff.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/backoff/backoff.h" #include diff --git a/src/core/lib/backoff/backoff.h b/src/core/lib/backoff/backoff.h index de30e5268b3..e769d150ef4 100644 --- a/src/core/lib/backoff/backoff.h +++ b/src/core/lib/backoff/backoff.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_BACKOFF_BACKOFF_H #define GRPC_CORE_LIB_BACKOFF_BACKOFF_H +#include + #include "src/core/lib/iomgr/exec_ctx.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index c59bd0c7e75..c0d6a17356b 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H #define GRPC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H +#include + #include #include #include "src/core/lib/iomgr/socket_mutator.h" diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc index 737d828e4b6..a9459b150d1 100644 --- a/src/core/lib/channel/channel_stack.cc +++ b/src/core/lib/channel/channel_stack.cc @@ -16,9 +16,11 @@ * */ -#include "src/core/lib/channel/channel_stack.h" +#include + #include #include +#include "src/core/lib/channel/channel_stack.h" #include #include diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index b9f97480012..4bf82186644 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -33,6 +33,8 @@ Call stacks are created by channel stacks and represent the per-call data for that stack. */ +#include + #include #include diff --git a/src/core/lib/channel/channel_stack_builder.cc b/src/core/lib/channel/channel_stack_builder.cc index cae862ec0e7..8a724490345 100644 --- a/src/core/lib/channel/channel_stack_builder.cc +++ b/src/core/lib/channel/channel_stack_builder.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/channel/channel_stack_builder.h" #include diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h index d00ddc698c6..c9a170bc88d 100644 --- a/src/core/lib/channel/channel_stack_builder.h +++ b/src/core/lib/channel/channel_stack_builder.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H #define GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H +#include + #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index a16e89ce009..ddd30294020 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/channel/connected_channel.h" #include diff --git a/src/core/lib/channel/connected_channel.h b/src/core/lib/channel/connected_channel.h index 91de8022db5..faa1c73a21f 100644 --- a/src/core/lib/channel/connected_channel.h +++ b/src/core/lib/channel/connected_channel.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_CHANNEL_CONNECTED_CHANNEL_H #define GRPC_CORE_LIB_CHANNEL_CONNECTED_CHANNEL_H +#include + #include "src/core/lib/channel/channel_stack_builder.h" extern const grpc_channel_filter grpc_connected_filter; diff --git a/src/core/lib/channel/handshaker.cc b/src/core/lib/channel/handshaker.cc index 518e880c154..9b1af8d6cbd 100644 --- a/src/core/lib/channel/handshaker.cc +++ b/src/core/lib/channel/handshaker.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/channel/handshaker.h b/src/core/lib/channel/handshaker.h index 68e54631230..dfecd81004e 100644 --- a/src/core/lib/channel/handshaker.h +++ b/src/core/lib/channel/handshaker.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_CHANNEL_HANDSHAKER_H #define GRPC_CORE_LIB_CHANNEL_HANDSHAKER_H +#include + #include #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/lib/channel/handshaker_factory.cc b/src/core/lib/channel/handshaker_factory.cc index 2380d98300f..4fd43635b6b 100644 --- a/src/core/lib/channel/handshaker_factory.cc +++ b/src/core/lib/channel/handshaker_factory.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/channel/handshaker_factory.h" #include diff --git a/src/core/lib/channel/handshaker_factory.h b/src/core/lib/channel/handshaker_factory.h index 8a7c0157e8b..9e36443958d 100644 --- a/src/core/lib/channel/handshaker_factory.h +++ b/src/core/lib/channel/handshaker_factory.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_CHANNEL_HANDSHAKER_FACTORY_H #define GRPC_CORE_LIB_CHANNEL_HANDSHAKER_FACTORY_H +#include + #include #include "src/core/lib/channel/handshaker.h" diff --git a/src/core/lib/channel/handshaker_registry.cc b/src/core/lib/channel/handshaker_registry.cc index 5464cc42f46..eec3e1b352d 100644 --- a/src/core/lib/channel/handshaker_registry.cc +++ b/src/core/lib/channel/handshaker_registry.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/channel/handshaker_registry.h" #include diff --git a/src/core/lib/channel/handshaker_registry.h b/src/core/lib/channel/handshaker_registry.h index 0b05531b7ef..b42d61ff43b 100644 --- a/src/core/lib/channel/handshaker_registry.h +++ b/src/core/lib/channel/handshaker_registry.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_CHANNEL_HANDSHAKER_REGISTRY_H #define GRPC_CORE_LIB_CHANNEL_HANDSHAKER_REGISTRY_H +#include + #include #include "src/core/lib/channel/handshaker_factory.h" diff --git a/src/core/lib/compression/algorithm_metadata.h b/src/core/lib/compression/algorithm_metadata.h index 7db771ea747..1be79e59c00 100644 --- a/src/core/lib/compression/algorithm_metadata.h +++ b/src/core/lib/compression/algorithm_metadata.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_COMPRESSION_ALGORITHM_METADATA_H #define GRPC_CORE_LIB_COMPRESSION_ALGORITHM_METADATA_H +#include + #include #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/transport/metadata.h" diff --git a/src/core/lib/compression/compression.cc b/src/core/lib/compression/compression.cc index 69d70ea9418..48717541a76 100644 --- a/src/core/lib/compression/compression.cc +++ b/src/core/lib/compression/compression.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc index 36829c8adf1..538514caf37 100644 --- a/src/core/lib/compression/compression_internal.cc +++ b/src/core/lib/compression/compression_internal.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/compression/compression_internal.h b/src/core/lib/compression/compression_internal.h index 72f01dd1b7b..da007368b01 100644 --- a/src/core/lib/compression/compression_internal.h +++ b/src/core/lib/compression/compression_internal.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H #define GRPC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H +#include + #include #ifdef __cplusplus diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc index 2e445519357..e06454f871c 100644 --- a/src/core/lib/compression/message_compress.cc +++ b/src/core/lib/compression/message_compress.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/compression/message_compress.h" #include diff --git a/src/core/lib/compression/message_compress.h b/src/core/lib/compression/message_compress.h index ed9e5bfa39d..91654e47e33 100644 --- a/src/core/lib/compression/message_compress.h +++ b/src/core/lib/compression/message_compress.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_COMPRESSION_MESSAGE_COMPRESS_H #define GRPC_CORE_LIB_COMPRESSION_MESSAGE_COMPRESS_H +#include + #include #include "src/core/lib/compression/compression_internal.h" diff --git a/src/core/lib/compression/stream_compression.cc b/src/core/lib/compression/stream_compression.cc index b4b3e524d0e..46cb3daf4cc 100644 --- a/src/core/lib/compression/stream_compression.cc +++ b/src/core/lib/compression/stream_compression.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include "src/core/lib/compression/stream_compression.h" diff --git a/src/core/lib/compression/stream_compression.h b/src/core/lib/compression/stream_compression.h index 8322835c4fd..c80f2f8692b 100644 --- a/src/core/lib/compression/stream_compression.h +++ b/src/core/lib/compression/stream_compression.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_COMPRESSION_STREAM_COMPRESSION_H #define GRPC_CORE_LIB_COMPRESSION_STREAM_COMPRESSION_H +#include + #include #include diff --git a/src/core/lib/compression/stream_compression_gzip.cc b/src/core/lib/compression/stream_compression_gzip.cc index 48fe99b69fd..682f712843a 100644 --- a/src/core/lib/compression/stream_compression_gzip.cc +++ b/src/core/lib/compression/stream_compression_gzip.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/compression/stream_compression_gzip.h b/src/core/lib/compression/stream_compression_gzip.h index 7cf49a0de93..740f09734a6 100644 --- a/src/core/lib/compression/stream_compression_gzip.h +++ b/src/core/lib/compression/stream_compression_gzip.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_COMPRESSION_STREAM_COMPRESSION_GZIP_H #define GRPC_CORE_LIB_COMPRESSION_STREAM_COMPRESSION_GZIP_H +#include + #include "src/core/lib/compression/stream_compression.h" extern const grpc_stream_compression_vtable grpc_stream_compression_gzip_vtable; diff --git a/src/core/lib/compression/stream_compression_identity.cc b/src/core/lib/compression/stream_compression_identity.cc index 933d24b3a12..52a6236621c 100644 --- a/src/core/lib/compression/stream_compression_identity.cc +++ b/src/core/lib/compression/stream_compression_identity.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/compression/stream_compression_identity.h b/src/core/lib/compression/stream_compression_identity.h index 41926e949e5..cc77b63ecdf 100644 --- a/src/core/lib/compression/stream_compression_identity.h +++ b/src/core/lib/compression/stream_compression_identity.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_COMPRESSION_STREAM_COMPRESSION_IDENTITY_H #define GRPC_CORE_LIB_COMPRESSION_STREAM_COMPRESSION_IDENTITY_H +#include + #include "src/core/lib/compression/stream_compression.h" extern const grpc_stream_compression_vtable diff --git a/src/core/lib/debug/stats.cc b/src/core/lib/debug/stats.cc index 09a86287e49..d8ddf03ac1c 100644 --- a/src/core/lib/debug/stats.cc +++ b/src/core/lib/debug/stats.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/debug/stats.h" #include diff --git a/src/core/lib/debug/stats.h b/src/core/lib/debug/stats.h index 02eed5e844f..749665262aa 100644 --- a/src/core/lib/debug/stats.h +++ b/src/core/lib/debug/stats.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_DEBUG_STATS_H #define GRPC_CORE_LIB_DEBUG_STATS_H +#include + #include #include "src/core/lib/debug/stats_data.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/debug/stats_data.cc b/src/core/lib/debug/stats_data.cc index e2d3a6d073e..309ece94bb8 100644 --- a/src/core/lib/debug/stats_data.cc +++ b/src/core/lib/debug/stats_data.cc @@ -18,8 +18,10 @@ * Automatically generated by tools/codegen/core/gen_stats_data.py */ -#include "src/core/lib/debug/stats_data.h" +#include + #include "src/core/lib/debug/stats.h" +#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/debug/stats_data.h b/src/core/lib/debug/stats_data.h index 4504be33e7e..da1266ad736 100644 --- a/src/core/lib/debug/stats_data.h +++ b/src/core/lib/debug/stats_data.h @@ -21,6 +21,8 @@ #ifndef GRPC_CORE_LIB_DEBUG_STATS_DATA_H #define GRPC_CORE_LIB_DEBUG_STATS_DATA_H +#include + #include #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc index c0cefd06398..b0e0f2ba7c6 100644 --- a/src/core/lib/debug/trace.cc +++ b/src/core/lib/debug/trace.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/debug/trace.h" #include diff --git a/src/core/lib/debug/trace.h b/src/core/lib/debug/trace.h index 69ddd802222..bfec92c529c 100644 --- a/src/core/lib/debug/trace.h +++ b/src/core/lib/debug/trace.h @@ -19,8 +19,9 @@ #ifndef GRPC_CORE_LIB_DEBUG_TRACE_H #define GRPC_CORE_LIB_DEBUG_TRACE_H -#include #include + +#include #include void grpc_tracer_init(const char* env_var_name); diff --git a/src/core/lib/gpr/alloc.cc b/src/core/lib/gpr/alloc.cc index e0d25963edb..611e4cceee4 100644 --- a/src/core/lib/gpr/alloc.cc +++ b/src/core/lib/gpr/alloc.cc @@ -16,10 +16,11 @@ * */ +#include + #include #include -#include #include #include #include "src/core/lib/profiling/timers.h" diff --git a/src/core/lib/gpr/arena.cc b/src/core/lib/gpr/arena.cc index 2d514df68bf..444bb3d7194 100644 --- a/src/core/lib/gpr/arena.cc +++ b/src/core/lib/gpr/arena.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/gpr/arena.h" #include diff --git a/src/core/lib/gpr/arena.h b/src/core/lib/gpr/arena.h index 339771c0e3c..6d2a073dd58 100644 --- a/src/core/lib/gpr/arena.h +++ b/src/core/lib/gpr/arena.h @@ -25,6 +25,8 @@ #ifndef GRPC_CORE_LIB_GPR_ARENA_H #define GRPC_CORE_LIB_GPR_ARENA_H +#include + #include typedef struct gpr_arena gpr_arena; diff --git a/src/core/lib/gpr/atm.cc b/src/core/lib/gpr/atm.cc index 3d0b4303484..649d400d38e 100644 --- a/src/core/lib/gpr/atm.cc +++ b/src/core/lib/gpr/atm.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/gpr/env.h b/src/core/lib/gpr/env.h index b31e20b7d21..aec8a3166b1 100644 --- a/src/core/lib/gpr/env.h +++ b/src/core/lib/gpr/env.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPR_ENV_H #define GRPC_CORE_LIB_GPR_ENV_H +#include + #include /* Env utility functions */ diff --git a/src/core/lib/gpr/fork.cc b/src/core/lib/gpr/fork.cc index 4651d22595c..812522b058a 100644 --- a/src/core/lib/gpr/fork.cc +++ b/src/core/lib/gpr/fork.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/gpr/fork.h" #include diff --git a/src/core/lib/gpr/host_port.cc b/src/core/lib/gpr/host_port.cc index 5a03a16296d..a34e01cb516 100644 --- a/src/core/lib/gpr/host_port.cc +++ b/src/core/lib/gpr/host_port.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/gpr/host_port.h" #include diff --git a/src/core/lib/gpr/log.cc b/src/core/lib/gpr/log.cc index 410096c0f76..72787ab7240 100644 --- a/src/core/lib/gpr/log.cc +++ b/src/core/lib/gpr/log.cc @@ -16,10 +16,11 @@ * */ +#include + #include #include #include -#include #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" diff --git a/src/core/lib/gpr/mpscq.cc b/src/core/lib/gpr/mpscq.cc index d7718273a67..076a6bb033c 100644 --- a/src/core/lib/gpr/mpscq.cc +++ b/src/core/lib/gpr/mpscq.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/gpr/mpscq.h" #include diff --git a/src/core/lib/gpr/mpscq.h b/src/core/lib/gpr/mpscq.h index 4409c5c9f5e..6b67880d1bd 100644 --- a/src/core/lib/gpr/mpscq.h +++ b/src/core/lib/gpr/mpscq.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPR_MPSCQ_H #define GRPC_CORE_LIB_GPR_MPSCQ_H +#include + #include #include #include diff --git a/src/core/lib/gpr/murmur_hash.cc b/src/core/lib/gpr/murmur_hash.cc index 01a7290c67d..cf25abf40d5 100644 --- a/src/core/lib/gpr/murmur_hash.cc +++ b/src/core/lib/gpr/murmur_hash.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/gpr/murmur_hash.h" #include diff --git a/src/core/lib/gpr/spinlock.h b/src/core/lib/gpr/spinlock.h index f03be1d7919..9f35530a869 100644 --- a/src/core/lib/gpr/spinlock.h +++ b/src/core/lib/gpr/spinlock.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPR_SPINLOCK_H #define GRPC_CORE_LIB_GPR_SPINLOCK_H +#include + #include /* Simple spinlock. No backoff strategy, gpr_spinlock_lock is almost always diff --git a/src/core/lib/gpr/string.cc b/src/core/lib/gpr/string.cc index 5a16377e490..ef2a6900b45 100644 --- a/src/core/lib/gpr/string.cc +++ b/src/core/lib/gpr/string.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/gpr/string.h" #include @@ -26,7 +28,6 @@ #include #include -#include #include #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/gpr/string.h b/src/core/lib/gpr/string.h index ef3a8c6086e..2e8a4898d9d 100644 --- a/src/core/lib/gpr/string.h +++ b/src/core/lib/gpr/string.h @@ -19,11 +19,11 @@ #ifndef GRPC_CORE_LIB_GPR_STRING_H #define GRPC_CORE_LIB_GPR_STRING_H +#include + #include #include -#include - /* String utility functions */ /* Flags for gpr_dump function. */ diff --git a/src/core/lib/gpr/sync.cc b/src/core/lib/gpr/sync.cc index 347ffcd00e2..2f18fc5ecb4 100644 --- a/src/core/lib/gpr/sync.cc +++ b/src/core/lib/gpr/sync.cc @@ -18,6 +18,8 @@ /* Generic implementation of synchronization primitives. */ +#include + #include #include #include diff --git a/src/core/lib/gpr/thd.cc b/src/core/lib/gpr/thd.cc index 11391418b16..b5341c41b43 100644 --- a/src/core/lib/gpr/thd.cc +++ b/src/core/lib/gpr/thd.cc @@ -18,6 +18,8 @@ /* Platform-independent features for gpr threads. */ +#include + #include "src/core/lib/gpr/thd.h" #include diff --git a/src/core/lib/gpr/thd.h b/src/core/lib/gpr/thd.h index 58ce0d0088f..920b3367082 100644 --- a/src/core/lib/gpr/thd.h +++ b/src/core/lib/gpr/thd.h @@ -25,6 +25,7 @@ */ #include + #include #include diff --git a/src/core/lib/gpr/time.cc b/src/core/lib/gpr/time.cc index 39ebeb43395..64c1c98f560 100644 --- a/src/core/lib/gpr/time.cc +++ b/src/core/lib/gpr/time.cc @@ -18,6 +18,8 @@ /* Generic implementation of time calls. */ +#include + #include #include #include diff --git a/src/core/lib/gpr/time_posix.cc b/src/core/lib/gpr/time_posix.cc index 09171c9c483..28836bfa54e 100644 --- a/src/core/lib/gpr/time_posix.cc +++ b/src/core/lib/gpr/time_posix.cc @@ -17,6 +17,7 @@ */ #include + #include "src/core/lib/gpr/time_precise.h" #ifdef GPR_POSIX_TIME diff --git a/src/core/lib/gpr/time_precise.cc b/src/core/lib/gpr/time_precise.cc index 3c7aaabc402..1b34fd7eb1b 100644 --- a/src/core/lib/gpr/time_precise.cc +++ b/src/core/lib/gpr/time_precise.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include diff --git a/src/core/lib/gpr/time_precise.h b/src/core/lib/gpr/time_precise.h index acc4ee3d1b5..a63ea9dc689 100644 --- a/src/core/lib/gpr/time_precise.h +++ b/src/core/lib/gpr/time_precise.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPR_TIME_PRECISE_H #define GRPC_CORE_LIB_GPR_TIME_PRECISE_H +#include + #include void gpr_precise_clock_init(void); diff --git a/src/core/lib/gpr/tls_gcc.h b/src/core/lib/gpr/tls_gcc.h index 14c59eca55f..72b360b0211 100644 --- a/src/core/lib/gpr/tls_gcc.h +++ b/src/core/lib/gpr/tls_gcc.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPR_TLS_GCC_H #define GRPC_CORE_LIB_GPR_TLS_GCC_H +#include + #include #include diff --git a/src/core/lib/gpr/tls_msvc.h b/src/core/lib/gpr/tls_msvc.h index a6cc4174bec..f4b3f0f50f6 100644 --- a/src/core/lib/gpr/tls_msvc.h +++ b/src/core/lib/gpr/tls_msvc.h @@ -20,6 +20,8 @@ #define GRPC_CORE_LIB_GPR_TLS_MSVC_H /** Thread local storage based on ms visual c compiler primitives. +#include + #include tls.h to use this - and see that file for documentation */ struct gpr_msvc_thread_local { diff --git a/src/core/lib/gpr/tls_pthread.h b/src/core/lib/gpr/tls_pthread.h index 9202653dcb6..a15f2f33897 100644 --- a/src/core/lib/gpr/tls_pthread.h +++ b/src/core/lib/gpr/tls_pthread.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPR_TLS_PTHREAD_H #define GRPC_CORE_LIB_GPR_TLS_PTHREAD_H +#include + #include /* for GPR_ASSERT */ #include diff --git a/src/core/lib/gpr/tmpfile.h b/src/core/lib/gpr/tmpfile.h index f47ec7aa637..3ce3ff5e5d2 100644 --- a/src/core/lib/gpr/tmpfile.h +++ b/src/core/lib/gpr/tmpfile.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPR_TMPFILE_H #define GRPC_CORE_LIB_GPR_TMPFILE_H +#include + #include /* Creates a temporary file from a prefix. diff --git a/src/core/lib/gprpp/atomic_with_atm.h b/src/core/lib/gprpp/atomic_with_atm.h index 6abf0bc38dd..3d0021bb1ce 100644 --- a/src/core/lib/gprpp/atomic_with_atm.h +++ b/src/core/lib/gprpp/atomic_with_atm.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPRPP_ATOMIC_WITH_ATM_H #define GRPC_CORE_LIB_GPRPP_ATOMIC_WITH_ATM_H +#include + #include namespace grpc_core { diff --git a/src/core/lib/gprpp/atomic_with_std.h b/src/core/lib/gprpp/atomic_with_std.h index 83322b81c1a..a4ad16e5cf7 100644 --- a/src/core/lib/gprpp/atomic_with_std.h +++ b/src/core/lib/gprpp/atomic_with_std.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPRPP_ATOMIC_WITH_STD_H #define GRPC_CORE_LIB_GPRPP_ATOMIC_WITH_STD_H +#include + #include namespace grpc_core { diff --git a/src/core/lib/gprpp/inlined_vector.h b/src/core/lib/gprpp/inlined_vector.h index 2ced3d74b8a..ca95aecddcb 100644 --- a/src/core/lib/gprpp/inlined_vector.h +++ b/src/core/lib/gprpp/inlined_vector.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPRPP_INLINED_VECTOR_H #define GRPC_CORE_LIB_GPRPP_INLINED_VECTOR_H +#include + #include #include "src/core/lib/gprpp/memory.h" diff --git a/src/core/lib/gprpp/manual_constructor.h b/src/core/lib/gprpp/manual_constructor.h index cee38abc1bb..a1770486052 100644 --- a/src/core/lib/gprpp/manual_constructor.h +++ b/src/core/lib/gprpp/manual_constructor.h @@ -21,6 +21,8 @@ // manually construct a region of memory with some type +#include + #include #include #include diff --git a/src/core/lib/gprpp/memory.h b/src/core/lib/gprpp/memory.h index f7cd6424afd..f84e20eeea3 100644 --- a/src/core/lib/gprpp/memory.h +++ b/src/core/lib/gprpp/memory.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPRPP_MEMORY_H #define GRPC_CORE_LIB_GPRPP_MEMORY_H +#include + #include #include diff --git a/src/core/lib/gprpp/orphanable.h b/src/core/lib/gprpp/orphanable.h index 78d1b01ff80..9e9e7f015f3 100644 --- a/src/core/lib/gprpp/orphanable.h +++ b/src/core/lib/gprpp/orphanable.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPRPP_ORPHANABLE_H #define GRPC_CORE_LIB_GPRPP_ORPHANABLE_H +#include + #include #include diff --git a/src/core/lib/gprpp/ref_counted.h b/src/core/lib/gprpp/ref_counted.h index ab589fc01ad..02b115a40e3 100644 --- a/src/core/lib/gprpp/ref_counted.h +++ b/src/core/lib/gprpp/ref_counted.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPRPP_REF_COUNTED_H #define GRPC_CORE_LIB_GPRPP_REF_COUNTED_H +#include + #include #include diff --git a/src/core/lib/gprpp/ref_counted_ptr.h b/src/core/lib/gprpp/ref_counted_ptr.h index f82ba50da3b..72088e76ef4 100644 --- a/src/core/lib/gprpp/ref_counted_ptr.h +++ b/src/core/lib/gprpp/ref_counted_ptr.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H #define GRPC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H +#include + #include #include "src/core/lib/gprpp/memory.h" diff --git a/src/core/lib/http/format_request.cc b/src/core/lib/http/format_request.cc index 6581bef7cd3..17123446483 100644 --- a/src/core/lib/http/format_request.cc +++ b/src/core/lib/http/format_request.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/http/format_request.h" #include diff --git a/src/core/lib/http/format_request.h b/src/core/lib/http/format_request.h index c1919651f96..bcc332fe6e7 100644 --- a/src/core/lib/http/format_request.h +++ b/src/core/lib/http/format_request.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_HTTP_FORMAT_REQUEST_H #define GRPC_CORE_LIB_HTTP_FORMAT_REQUEST_H +#include + #include #include "src/core/lib/http/httpcli.h" diff --git a/src/core/lib/http/httpcli.cc b/src/core/lib/http/httpcli.cc index 2cdca484875..12060074c53 100644 --- a/src/core/lib/http/httpcli.cc +++ b/src/core/lib/http/httpcli.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/http/httpcli.h" #include diff --git a/src/core/lib/http/httpcli.h b/src/core/lib/http/httpcli.h index 72d20cc7a34..b0735081f2b 100644 --- a/src/core/lib/http/httpcli.h +++ b/src/core/lib/http/httpcli.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_HTTP_HTTPCLI_H #define GRPC_CORE_LIB_HTTP_HTTPCLI_H +#include + #include #include diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc index d754558060f..180912383f9 100644 --- a/src/core/lib/http/httpcli_security_connector.cc +++ b/src/core/lib/http/httpcli_security_connector.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/http/httpcli.h" #include diff --git a/src/core/lib/http/parser.cc b/src/core/lib/http/parser.cc index 724b6d18857..a37fdda8ea7 100644 --- a/src/core/lib/http/parser.cc +++ b/src/core/lib/http/parser.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/http/parser.h" #include diff --git a/src/core/lib/http/parser.h b/src/core/lib/http/parser.h index 5fef4480199..1d2e13e8317 100644 --- a/src/core/lib/http/parser.h +++ b/src/core/lib/http/parser.h @@ -19,8 +19,9 @@ #ifndef GRPC_CORE_LIB_HTTP_PARSER_H #define GRPC_CORE_LIB_HTTP_PARSER_H -#include #include + +#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index 3b11e0266df..24e11b687be 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/call_combiner.h" #include diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index 4814dbf8d21..16829e57071 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_CALL_COMBINER_H #define GRPC_CORE_LIB_IOMGR_CALL_COMBINER_H +#include + #include #include diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index a7edf17e9be..e66df031823 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/combiner.h" #include diff --git a/src/core/lib/iomgr/combiner.h b/src/core/lib/iomgr/combiner.h index c62d21a0513..0d63e468dfb 100644 --- a/src/core/lib/iomgr/combiner.h +++ b/src/core/lib/iomgr/combiner.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_COMBINER_H #define GRPC_CORE_LIB_IOMGR_COMBINER_H +#include + #include #include diff --git a/src/core/lib/iomgr/endpoint.cc b/src/core/lib/iomgr/endpoint.cc index 9d4b1028227..e22c21e4bdc 100644 --- a/src/core/lib/iomgr/endpoint.cc +++ b/src/core/lib/iomgr/endpoint.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/endpoint.h" void grpc_endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* slices, diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h index cd530993342..15db1649fa9 100644 --- a/src/core/lib/iomgr/endpoint.h +++ b/src/core/lib/iomgr/endpoint.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_ENDPOINT_H #define GRPC_CORE_LIB_IOMGR_ENDPOINT_H +#include + #include #include #include diff --git a/src/core/lib/iomgr/endpoint_pair.h b/src/core/lib/iomgr/endpoint_pair.h index 506ffc88b4b..08f9e3cabc1 100644 --- a/src/core/lib/iomgr/endpoint_pair.h +++ b/src/core/lib/iomgr/endpoint_pair.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_ENDPOINT_PAIR_H #define GRPC_CORE_LIB_IOMGR_ENDPOINT_PAIR_H +#include + #include "src/core/lib/iomgr/endpoint.h" typedef struct { diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 3ad6b477561..49850ab3a12 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/endpoint_pair_uv.cc b/src/core/lib/iomgr/endpoint_pair_uv.cc index 128a947d1bb..b99d178cb67 100644 --- a/src/core/lib/iomgr/endpoint_pair_uv.cc +++ b/src/core/lib/iomgr/endpoint_pair_uv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index cc07ac07081..416c9d88a17 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h index 8c72a439f63..f8cae4da82a 100644 --- a/src/core/lib/iomgr/error.h +++ b/src/core/lib/iomgr/error.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_ERROR_H #define GRPC_CORE_LIB_IOMGR_ERROR_H +#include + #include #include diff --git a/src/core/lib/iomgr/error_internal.h b/src/core/lib/iomgr/error_internal.h index 6cb09c2cdbd..7fde347abd0 100644 --- a/src/core/lib/iomgr/error_internal.h +++ b/src/core/lib/iomgr/error_internal.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_ERROR_INTERNAL_H #define GRPC_CORE_LIB_IOMGR_ERROR_INTERNAL_H +#include + #include #include // TODO, do we need this? diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index f84f3f8205e..3ebaf181c1f 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #include diff --git a/src/core/lib/iomgr/ev_epoll1_linux.h b/src/core/lib/iomgr/ev_epoll1_linux.h index 9a1b96bd45a..ca0db7250f0 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.h +++ b/src/core/lib/iomgr/ev_epoll1_linux.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_EV_EPOLL1_LINUX_H #define GRPC_CORE_LIB_IOMGR_EV_EPOLL1_LINUX_H +#include + #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index bb7622c4cc5..d3cbaf9d0ae 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #include diff --git a/src/core/lib/iomgr/ev_epollex_linux.h b/src/core/lib/iomgr/ev_epollex_linux.h index ffa7fc7f327..e70ba72a7db 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.h +++ b/src/core/lib/iomgr/ev_epollex_linux.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_EV_EPOLLEX_LINUX_H #define GRPC_CORE_LIB_IOMGR_EV_EPOLLEX_LINUX_H +#include + #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/ev_epollsig_linux.cc b/src/core/lib/iomgr/ev_epollsig_linux.cc index 5c99c72aa59..1e30f6637b3 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.cc +++ b/src/core/lib/iomgr/ev_epollsig_linux.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #include diff --git a/src/core/lib/iomgr/ev_epollsig_linux.h b/src/core/lib/iomgr/ev_epollsig_linux.h index 48178d3713c..2ba2f0a63b4 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.h +++ b/src/core/lib/iomgr/ev_epollsig_linux.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_EV_EPOLLSIG_LINUX_H #define GRPC_CORE_LIB_IOMGR_EV_EPOLLSIG_LINUX_H +#include + #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index e630ddf8e04..e979ff7eb5f 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/ev_poll_posix.h b/src/core/lib/iomgr/ev_poll_posix.h index f6bc624d4fd..ab3cd9029e6 100644 --- a/src/core/lib/iomgr/ev_poll_posix.h +++ b/src/core/lib/iomgr/ev_poll_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_EV_POLL_POSIX_H #define GRPC_CORE_LIB_IOMGR_EV_POLL_POSIX_H +#include + #include "src/core/lib/iomgr/ev_posix.h" const grpc_event_engine_vtable* grpc_init_poll_posix(bool explicit_request); diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 42807944287..39ce459f1ef 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/ev_posix.h b/src/core/lib/iomgr/ev_posix.h index 62f1162a23f..6a5129a74dd 100644 --- a/src/core/lib/iomgr/ev_posix.h +++ b/src/core/lib/iomgr/ev_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_EV_POSIX_H #define GRPC_CORE_LIB_IOMGR_EV_POSIX_H +#include + #include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/iomgr/ev_windows.cc b/src/core/lib/iomgr/ev_windows.cc index 697697d0b00..32c62b7a762 100644 --- a/src/core/lib/iomgr/ev_windows.cc +++ b/src/core/lib/iomgr/ev_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 1a2284f474f..132fe878705 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/exec_ctx.h" #include diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 3d9a1576279..de97164f02c 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_EXEC_CTX_H #define GRPC_CORE_LIB_IOMGR_EXEC_CTX_H +#include + #include #include #include diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index d2a050919e8..e7f412a5625 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/executor.h" #include diff --git a/src/core/lib/iomgr/executor.h b/src/core/lib/iomgr/executor.h index e16f11aa215..68d540af557 100644 --- a/src/core/lib/iomgr/executor.h +++ b/src/core/lib/iomgr/executor.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_EXECUTOR_H #define GRPC_CORE_LIB_IOMGR_EXECUTOR_H +#include + #include "src/core/lib/iomgr/closure.h" typedef enum { diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index c9a65c57022..d32fbc45883 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_FORK diff --git a/src/core/lib/iomgr/fork_windows.cc b/src/core/lib/iomgr/fork_windows.cc index f9986f33c75..798f671bdff 100644 --- a/src/core/lib/iomgr/fork_windows.cc +++ b/src/core/lib/iomgr/fork_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifndef GRPC_POSIX_FORK diff --git a/src/core/lib/iomgr/gethostname_fallback.cc b/src/core/lib/iomgr/gethostname_fallback.cc index 81e2c7aeec0..65ae818723a 100644 --- a/src/core/lib/iomgr/gethostname_fallback.cc +++ b/src/core/lib/iomgr/gethostname_fallback.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/gethostname_host_name_max.cc b/src/core/lib/iomgr/gethostname_host_name_max.cc index ae95788a1ee..79f5daa8f32 100644 --- a/src/core/lib/iomgr/gethostname_host_name_max.cc +++ b/src/core/lib/iomgr/gethostname_host_name_max.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/gethostname_sysconf.cc b/src/core/lib/iomgr/gethostname_sysconf.cc index 3d74e033388..92c5de3338e 100644 --- a/src/core/lib/iomgr/gethostname_sysconf.cc +++ b/src/core/lib/iomgr/gethostname_sysconf.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index 4716872ce45..5285734719e 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/iocp_windows.h b/src/core/lib/iomgr/iocp_windows.h index 75b0ff4a922..5079ea5d84d 100644 --- a/src/core/lib/iomgr/iocp_windows.h +++ b/src/core/lib/iomgr/iocp_windows.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_IOCP_WINDOWS_H #define GRPC_CORE_LIB_IOMGR_IOCP_WINDOWS_H +#include + #include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h index c7cde7ea59c..e6d66e545ce 100644 --- a/src/core/lib/iomgr/iomgr.h +++ b/src/core/lib/iomgr/iomgr.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_IOMGR_H #define GRPC_CORE_LIB_IOMGR_IOMGR_H +#include + #include "src/core/lib/iomgr/port.h" /** Initializes the iomgr. */ diff --git a/src/core/lib/iomgr/iomgr_internal.h b/src/core/lib/iomgr/iomgr_internal.h index 20b3cb70d0b..644219fb4dc 100644 --- a/src/core/lib/iomgr/iomgr_internal.h +++ b/src/core/lib/iomgr/iomgr_internal.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H #define GRPC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H +#include + #include #include "src/core/lib/iomgr/iomgr.h" diff --git a/src/core/lib/iomgr/iomgr_posix.cc b/src/core/lib/iomgr/iomgr_posix.cc index f8f6fe23536..35b8adf01e0 100644 --- a/src/core/lib/iomgr/iomgr_posix.cc +++ b/src/core/lib/iomgr/iomgr_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/iomgr_posix.h b/src/core/lib/iomgr/iomgr_posix.h index f7a4af6a896..54ec46e1bb0 100644 --- a/src/core/lib/iomgr/iomgr_posix.h +++ b/src/core/lib/iomgr/iomgr_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_IOMGR_POSIX_H #define GRPC_CORE_LIB_IOMGR_IOMGR_POSIX_H +#include + #include "src/core/lib/iomgr/iomgr_internal.h" #endif /* GRPC_CORE_LIB_IOMGR_IOMGR_POSIX_H */ diff --git a/src/core/lib/iomgr/iomgr_uv.cc b/src/core/lib/iomgr/iomgr_uv.cc index c11bc28ad7e..c11c37ca205 100644 --- a/src/core/lib/iomgr/iomgr_uv.cc +++ b/src/core/lib/iomgr/iomgr_uv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV diff --git a/src/core/lib/iomgr/iomgr_uv.h b/src/core/lib/iomgr/iomgr_uv.h index a382f0a5ae9..4d62f00ad6e 100644 --- a/src/core/lib/iomgr/iomgr_uv.h +++ b/src/core/lib/iomgr/iomgr_uv.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_IOMGR_UV_H #define GRPC_CORE_LIB_IOMGR_IOMGR_UV_H +#include + #include "src/core/lib/iomgr/iomgr_internal.h" #include diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc index 630370166db..8c4888ca970 100644 --- a/src/core/lib/iomgr/iomgr_windows.cc +++ b/src/core/lib/iomgr/iomgr_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/is_epollexclusive_available.cc b/src/core/lib/iomgr/is_epollexclusive_available.cc index c46674c1ddd..036b77866f9 100644 --- a/src/core/lib/iomgr/is_epollexclusive_available.cc +++ b/src/core/lib/iomgr/is_epollexclusive_available.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/is_epollexclusive_available.h" diff --git a/src/core/lib/iomgr/is_epollexclusive_available.h b/src/core/lib/iomgr/is_epollexclusive_available.h index 9ae9c5c1915..8a44113c3f7 100644 --- a/src/core/lib/iomgr/is_epollexclusive_available.h +++ b/src/core/lib/iomgr/is_epollexclusive_available.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_IS_EPOLLEXCLUSIVE_AVAILABLE_H #define GRPC_CORE_LIB_IOMGR_IS_EPOLLEXCLUSIVE_AVAILABLE_H +#include + #include #ifdef __cplusplus diff --git a/src/core/lib/iomgr/load_file.cc b/src/core/lib/iomgr/load_file.cc index 7f5f642c983..f6431d0f1ca 100644 --- a/src/core/lib/iomgr/load_file.cc +++ b/src/core/lib/iomgr/load_file.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/load_file.h" #include diff --git a/src/core/lib/iomgr/load_file.h b/src/core/lib/iomgr/load_file.h index a7336527ce9..1cb2b5de731 100644 --- a/src/core/lib/iomgr/load_file.h +++ b/src/core/lib/iomgr/load_file.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_LOAD_FILE_H #define GRPC_CORE_LIB_IOMGR_LOAD_FILE_H +#include + #include #include diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index 7b194e3db5f..5b6b79fa914 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/lockfree_event.h" #include diff --git a/src/core/lib/iomgr/lockfree_event.h b/src/core/lib/iomgr/lockfree_event.h index 3bd3fd72f1a..83de656f5fc 100644 --- a/src/core/lib/iomgr/lockfree_event.h +++ b/src/core/lib/iomgr/lockfree_event.h @@ -21,6 +21,8 @@ /* Lock free event notification for file descriptors */ +#include + #include #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/nameser.h b/src/core/lib/iomgr/nameser.h index daed6de518c..22a00cdab8b 100644 --- a/src/core/lib/iomgr/nameser.h +++ b/src/core/lib/iomgr/nameser.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_NAMESER_H #define GRPC_CORE_LIB_IOMGR_NAMESER_H +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_HAVE_ARPA_NAMESER diff --git a/src/core/lib/iomgr/network_status_tracker.cc b/src/core/lib/iomgr/network_status_tracker.cc index 73f8fbf9fb7..d4b7f4a57d1 100644 --- a/src/core/lib/iomgr/network_status_tracker.cc +++ b/src/core/lib/iomgr/network_status_tracker.cc @@ -16,8 +16,10 @@ * */ -#include "src/core/lib/iomgr/network_status_tracker.h" +#include + #include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/network_status_tracker.h" void grpc_network_status_shutdown(void) {} diff --git a/src/core/lib/iomgr/network_status_tracker.h b/src/core/lib/iomgr/network_status_tracker.h index 32244d9b77a..198877f60f8 100644 --- a/src/core/lib/iomgr/network_status_tracker.h +++ b/src/core/lib/iomgr/network_status_tracker.h @@ -18,6 +18,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_NETWORK_STATUS_TRACKER_H #define GRPC_CORE_LIB_IOMGR_NETWORK_STATUS_TRACKER_H +#include + #include "src/core/lib/iomgr/endpoint.h" void grpc_network_status_init(void); diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index 126f6f45d6e..9f164f65b0c 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/iomgr/polling_entity.h b/src/core/lib/iomgr/polling_entity.h index 0102d32c11d..a95e08524c5 100644 --- a/src/core/lib/iomgr/polling_entity.h +++ b/src/core/lib/iomgr/polling_entity.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_POLLING_ENTITY_H #define GRPC_CORE_LIB_IOMGR_POLLING_ENTITY_H +#include + #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/lib/iomgr/pollset.h b/src/core/lib/iomgr/pollset.h index 6bb3cd3e0c0..9cc3e4c7fac 100644 --- a/src/core/lib/iomgr/pollset.h +++ b/src/core/lib/iomgr/pollset.h @@ -20,6 +20,7 @@ #define GRPC_CORE_LIB_IOMGR_POLLSET_H #include + #include #include diff --git a/src/core/lib/iomgr/pollset_set.h b/src/core/lib/iomgr/pollset_set.h index a94d0afe757..18f30aa94ed 100644 --- a/src/core/lib/iomgr/pollset_set.h +++ b/src/core/lib/iomgr/pollset_set.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_POLLSET_SET_H #define GRPC_CORE_LIB_IOMGR_POLLSET_SET_H +#include + #include "src/core/lib/iomgr/pollset.h" /* A grpc_pollset_set is a set of pollsets that are interested in an diff --git a/src/core/lib/iomgr/pollset_set_uv.cc b/src/core/lib/iomgr/pollset_set_uv.cc index ac5dade8a50..50814c1f0a4 100644 --- a/src/core/lib/iomgr/pollset_set_uv.cc +++ b/src/core/lib/iomgr/pollset_set_uv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV diff --git a/src/core/lib/iomgr/pollset_set_windows.cc b/src/core/lib/iomgr/pollset_set_windows.cc index 85edc9dee12..ff3f6a944e4 100644 --- a/src/core/lib/iomgr/pollset_set_windows.cc +++ b/src/core/lib/iomgr/pollset_set_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/pollset_set_windows.h b/src/core/lib/iomgr/pollset_set_windows.h index 1173f760a0c..5ac9d1823bd 100644 --- a/src/core/lib/iomgr/pollset_set_windows.h +++ b/src/core/lib/iomgr/pollset_set_windows.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_POLLSET_SET_WINDOWS_H #define GRPC_CORE_LIB_IOMGR_POLLSET_SET_WINDOWS_H +#include + #include "src/core/lib/iomgr/pollset_set.h" #endif /* GRPC_CORE_LIB_IOMGR_POLLSET_SET_WINDOWS_H */ diff --git a/src/core/lib/iomgr/pollset_uv.cc b/src/core/lib/iomgr/pollset_uv.cc index d9e5ad81be4..c6a2f43bf13 100644 --- a/src/core/lib/iomgr/pollset_uv.cc +++ b/src/core/lib/iomgr/pollset_uv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index 240a24dee1e..62ab760875a 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/pollset_windows.h b/src/core/lib/iomgr/pollset_windows.h index 93fe7d669ba..e89758c6941 100644 --- a/src/core/lib/iomgr/pollset_windows.h +++ b/src/core/lib/iomgr/pollset_windows.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_POLLSET_WINDOWS_H #define GRPC_CORE_LIB_IOMGR_POLLSET_WINDOWS_H +#include + #include #include "src/core/lib/iomgr/port.h" diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index 12fc2ed088f..10a78226548 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H #define GRPC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H +#include + #include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index 3dc1d871a19..9307f19bcf2 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/resolve_address_uv.cc b/src/core/lib/iomgr/resolve_address_uv.cc index 6eb6fe3af5d..4d8ea596f38 100644 --- a/src/core/lib/iomgr/resolve_address_uv.cc +++ b/src/core/lib/iomgr/resolve_address_uv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 8f4fd04402d..4e1dcaabafa 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc index c4763f3229b..8c42dd78cf1 100644 --- a/src/core/lib/iomgr/resource_quota.cc +++ b/src/core/lib/iomgr/resource_quota.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/resource_quota.h" #include diff --git a/src/core/lib/iomgr/resource_quota.h b/src/core/lib/iomgr/resource_quota.h index 39e3aabf189..4e1c651278d 100644 --- a/src/core/lib/iomgr/resource_quota.h +++ b/src/core/lib/iomgr/resource_quota.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_RESOURCE_QUOTA_H #define GRPC_CORE_LIB_IOMGR_RESOURCE_QUOTA_H +#include + #include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/iomgr/sockaddr.h b/src/core/lib/iomgr/sockaddr.h index 206d596ccd6..3b30da8a7db 100644 --- a/src/core/lib/iomgr/sockaddr.h +++ b/src/core/lib/iomgr/sockaddr.h @@ -23,6 +23,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_H #define GRPC_CORE_LIB_IOMGR_SOCKADDR_H +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV diff --git a/src/core/lib/iomgr/sockaddr_posix.h b/src/core/lib/iomgr/sockaddr_posix.h index 22d57ca6bb5..83981e0aa56 100644 --- a/src/core/lib/iomgr/sockaddr_posix.h +++ b/src/core/lib/iomgr/sockaddr_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_POSIX_H #define GRPC_CORE_LIB_IOMGR_SOCKADDR_POSIX_H +#include + #include #include #include diff --git a/src/core/lib/iomgr/sockaddr_utils.cc b/src/core/lib/iomgr/sockaddr_utils.cc index 69be87168e7..88f9b2ffd97 100644 --- a/src/core/lib/iomgr/sockaddr_utils.cc +++ b/src/core/lib/iomgr/sockaddr_utils.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/sockaddr_utils.h" #include @@ -24,7 +26,6 @@ #include #include -#include #include #include "src/core/lib/gpr/host_port.h" diff --git a/src/core/lib/iomgr/sockaddr_utils.h b/src/core/lib/iomgr/sockaddr_utils.h index e3bd51a4ad2..ace54a2a800 100644 --- a/src/core/lib/iomgr/sockaddr_utils.h +++ b/src/core/lib/iomgr/sockaddr_utils.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_UTILS_H #define GRPC_CORE_LIB_IOMGR_SOCKADDR_UTILS_H +#include + #include "src/core/lib/iomgr/resolve_address.h" /* Returns true if addr is an IPv4-mapped IPv6 address within the diff --git a/src/core/lib/iomgr/sockaddr_windows.h b/src/core/lib/iomgr/sockaddr_windows.h index 20e37c9fc46..3a4fcc9e8ab 100644 --- a/src/core/lib/iomgr/sockaddr_windows.h +++ b/src/core/lib/iomgr/sockaddr_windows.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H #define GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/socket_factory_posix.cc b/src/core/lib/iomgr/socket_factory_posix.cc index 3e696c2e104..1d1e36c0e33 100644 --- a/src/core/lib/iomgr/socket_factory_posix.cc +++ b/src/core/lib/iomgr/socket_factory_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/socket_factory_posix.h b/src/core/lib/iomgr/socket_factory_posix.h index af57cc5b605..9a52f4ea4ef 100644 --- a/src/core/lib/iomgr/socket_factory_posix.h +++ b/src/core/lib/iomgr/socket_factory_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKET_FACTORY_POSIX_H #define GRPC_CORE_LIB_IOMGR_SOCKET_FACTORY_POSIX_H +#include + #include #include #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/socket_mutator.cc b/src/core/lib/iomgr/socket_mutator.cc index eb219d7cb38..b9b8eaf4ad2 100644 --- a/src/core/lib/iomgr/socket_mutator.cc +++ b/src/core/lib/iomgr/socket_mutator.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/socket_mutator.h" #include diff --git a/src/core/lib/iomgr/socket_mutator.h b/src/core/lib/iomgr/socket_mutator.h index f8fd21d15a3..6c7781c51d5 100644 --- a/src/core/lib/iomgr/socket_mutator.h +++ b/src/core/lib/iomgr/socket_mutator.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H #define GRPC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H +#include + #include #include diff --git a/src/core/lib/iomgr/socket_utils.h b/src/core/lib/iomgr/socket_utils.h index 9fd141b6dec..e96eb97a7e8 100644 --- a/src/core/lib/iomgr/socket_utils.h +++ b/src/core/lib/iomgr/socket_utils.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_H #define GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_H +#include + #include /* A wrapper for inet_ntop on POSIX systems and InetNtop on Windows systems */ diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc index a0cca6195b3..4fb6c7ad633 100644 --- a/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET @@ -37,7 +39,6 @@ #include #include -#include #include #include "src/core/lib/gpr/host_port.h" diff --git a/src/core/lib/iomgr/socket_utils_linux.cc b/src/core/lib/iomgr/socket_utils_linux.cc index e8bf05c3a80..deb7c552679 100644 --- a/src/core/lib/iomgr/socket_utils_linux.cc +++ b/src/core/lib/iomgr/socket_utils_linux.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_LINUX_SOCKETUTILS diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc index c49cbb203bc..c856f641e36 100644 --- a/src/core/lib/iomgr/socket_utils_posix.cc +++ b/src/core/lib/iomgr/socket_utils_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKETUTILS diff --git a/src/core/lib/iomgr/socket_utils_posix.h b/src/core/lib/iomgr/socket_utils_posix.h index 77df4205ff2..1f50e8d3156 100644 --- a/src/core/lib/iomgr/socket_utils_posix.h +++ b/src/core/lib/iomgr/socket_utils_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_POSIX_H #define GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_POSIX_H +#include + #include "src/core/lib/iomgr/resolve_address.h" #include diff --git a/src/core/lib/iomgr/socket_utils_uv.cc b/src/core/lib/iomgr/socket_utils_uv.cc index 75316d8c248..3f650eef668 100644 --- a/src/core/lib/iomgr/socket_utils_uv.cc +++ b/src/core/lib/iomgr/socket_utils_uv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV diff --git a/src/core/lib/iomgr/socket_utils_windows.cc b/src/core/lib/iomgr/socket_utils_windows.cc index 0482a1783d4..5fc3b7617ef 100644 --- a/src/core/lib/iomgr/socket_utils_windows.cc +++ b/src/core/lib/iomgr/socket_utils_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINDOWS_SOCKETUTILS diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index 9bb6a75dd8c..2e23409582b 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/socket_windows.h b/src/core/lib/iomgr/socket_windows.h index cb28f2b8df1..3ff2c307e2a 100644 --- a/src/core/lib/iomgr/socket_windows.h +++ b/src/core/lib/iomgr/socket_windows.h @@ -20,6 +20,7 @@ #define GRPC_CORE_LIB_IOMGR_SOCKET_WINDOWS_H #include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/sys_epoll_wrapper.h b/src/core/lib/iomgr/sys_epoll_wrapper.h index 3fa5357156a..d21d853665b 100644 --- a/src/core/lib/iomgr/sys_epoll_wrapper.h +++ b/src/core/lib/iomgr/sys_epoll_wrapper.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_SYS_EPOLL_WRAPPER_H #define GRPC_CORE_LIB_IOMGR_SYS_EPOLL_WRAPPER_H +#include + #include #ifndef EPOLLEXCLUSIVE diff --git a/src/core/lib/iomgr/tcp_client.h b/src/core/lib/iomgr/tcp_client.h index 5f55d309553..a6b99e63c2c 100644 --- a/src/core/lib/iomgr/tcp_client.h +++ b/src/core/lib/iomgr/tcp_client.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_TCP_CLIENT_H #define GRPC_CORE_LIB_IOMGR_TCP_CLIENT_H +#include + #include #include #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index 33a0b0404d5..3fe2989c6b5 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/tcp_client_posix.h b/src/core/lib/iomgr/tcp_client_posix.h index 57e50a67d23..d0168ef1331 100644 --- a/src/core/lib/iomgr/tcp_client_posix.h +++ b/src/core/lib/iomgr/tcp_client_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_TCP_CLIENT_POSIX_H #define GRPC_CORE_LIB_IOMGR_TCP_CLIENT_POSIX_H +#include + #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/tcp_client.h" diff --git a/src/core/lib/iomgr/tcp_client_uv.cc b/src/core/lib/iomgr/tcp_client_uv.cc index 4e9c7cc11d9..d29d6c8f418 100644 --- a/src/core/lib/iomgr/tcp_client_uv.cc +++ b/src/core/lib/iomgr/tcp_client_uv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index d46569d7cc7..70c2495350f 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #include diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 50efd043821..ca0046b83ba 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/tcp_posix.h b/src/core/lib/iomgr/tcp_posix.h index 4529c02beb3..af89bd24db1 100644 --- a/src/core/lib/iomgr/tcp_posix.h +++ b/src/core/lib/iomgr/tcp_posix.h @@ -29,6 +29,8 @@ otherwise specified. */ +#include + #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/ev_posix.h" diff --git a/src/core/lib/iomgr/tcp_server.h b/src/core/lib/iomgr/tcp_server.h index 038c765c6cc..965d97407fa 100644 --- a/src/core/lib/iomgr/tcp_server.h +++ b/src/core/lib/iomgr/tcp_server.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_TCP_SERVER_H #define GRPC_CORE_LIB_IOMGR_TCP_SERVER_H +#include + #include #include "src/core/lib/iomgr/closure.h" diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index fe6108e4ac1..a609c09ea7e 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -21,6 +21,8 @@ #define _GNU_SOURCE #endif +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/tcp_server_utils_posix.h b/src/core/lib/iomgr/tcp_server_utils_posix.h index 6046f257f98..34d68130c98 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix.h +++ b/src/core/lib/iomgr/tcp_server_utils_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H #define GRPC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H +#include + #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/socket_utils_posix.h" diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc index be2a00a9dcf..846f9cccb7f 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc index 612c2584bcc..308ff0f8a6f 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_HAVE_IFADDRS diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc index 2d72b95defd..86ee14f2856 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #if defined(GRPC_POSIX_SOCKET) && !defined(GRPC_HAVE_IFADDRS) diff --git a/src/core/lib/iomgr/tcp_server_uv.cc b/src/core/lib/iomgr/tcp_server_uv.cc index 1ac49190fb4..aa423766c7f 100644 --- a/src/core/lib/iomgr/tcp_server_uv.cc +++ b/src/core/lib/iomgr/tcp_server_uv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index 8a30dfde433..6d19c1c4d72 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc index b384623a5e9..6db3217d6e7 100644 --- a/src/core/lib/iomgr/tcp_uv.cc +++ b/src/core/lib/iomgr/tcp_uv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV diff --git a/src/core/lib/iomgr/tcp_uv.h b/src/core/lib/iomgr/tcp_uv.h index fd6d19049ac..6b1a6f77c2c 100644 --- a/src/core/lib/iomgr/tcp_uv.h +++ b/src/core/lib/iomgr/tcp_uv.h @@ -29,6 +29,8 @@ otherwise specified. */ +#include + #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index 67777197858..aab8edc888e 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/tcp_windows.h b/src/core/lib/iomgr/tcp_windows.h index 8578a358ea8..161a545a2a5 100644 --- a/src/core/lib/iomgr/tcp_windows.h +++ b/src/core/lib/iomgr/tcp_windows.h @@ -29,6 +29,8 @@ otherwise specified. */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/time_averaged_stats.cc b/src/core/lib/iomgr/time_averaged_stats.cc index 3bddec04dd0..6369e48db0e 100644 --- a/src/core/lib/iomgr/time_averaged_stats.cc +++ b/src/core/lib/iomgr/time_averaged_stats.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/time_averaged_stats.h" void grpc_time_averaged_stats_init(grpc_time_averaged_stats* stats, diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h index 82049859c5b..67f1b1b3f9d 100644 --- a/src/core/lib/iomgr/timer.h +++ b/src/core/lib/iomgr/timer.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_TIMER_H #define GRPC_CORE_LIB_IOMGR_TIMER_H +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_UV @@ -27,7 +29,6 @@ #include "src/core/lib/iomgr/timer_generic.h" #endif /* GRPC_UV */ -#include #include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 697162f7a8d..52a571f4255 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #include diff --git a/src/core/lib/iomgr/timer_generic.h b/src/core/lib/iomgr/timer_generic.h index 190381e904a..97a45133553 100644 --- a/src/core/lib/iomgr/timer_generic.h +++ b/src/core/lib/iomgr/timer_generic.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_TIMER_GENERIC_H #define GRPC_CORE_LIB_IOMGR_TIMER_GENERIC_H +#include + #include #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/iomgr/timer_heap.cc b/src/core/lib/iomgr/timer_heap.cc index c26896ee4a3..e5b5abfc971 100644 --- a/src/core/lib/iomgr/timer_heap.cc +++ b/src/core/lib/iomgr/timer_heap.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_TIMER_USE_GENERIC diff --git a/src/core/lib/iomgr/timer_heap.h b/src/core/lib/iomgr/timer_heap.h index 436eef55a6a..503365d4cd6 100644 --- a/src/core/lib/iomgr/timer_heap.h +++ b/src/core/lib/iomgr/timer_heap.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_TIMER_HEAP_H #define GRPC_CORE_LIB_IOMGR_TIMER_HEAP_H +#include + #include "src/core/lib/iomgr/timer.h" typedef struct { diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 94e7953fde9..0210e700156 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -16,11 +16,12 @@ * */ +#include + #include "src/core/lib/iomgr/timer_manager.h" #include #include -#include #include diff --git a/src/core/lib/iomgr/timer_manager.h b/src/core/lib/iomgr/timer_manager.h index 0ba502928a5..3c4cdda2c80 100644 --- a/src/core/lib/iomgr/timer_manager.h +++ b/src/core/lib/iomgr/timer_manager.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_TIMER_MANAGER_H #define GRPC_CORE_LIB_IOMGR_TIMER_MANAGER_H +#include + #include /* Timer Manager tries to keep one thread waiting for the next timeout at all diff --git a/src/core/lib/iomgr/timer_uv.cc b/src/core/lib/iomgr/timer_uv.cc index 5d238da0892..6f28f553c5f 100644 --- a/src/core/lib/iomgr/timer_uv.cc +++ b/src/core/lib/iomgr/timer_uv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #if GRPC_UV diff --git a/src/core/lib/iomgr/timer_uv.h b/src/core/lib/iomgr/timer_uv.h index 214aaa600ac..093b2d085db 100644 --- a/src/core/lib/iomgr/timer_uv.h +++ b/src/core/lib/iomgr/timer_uv.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_TIMER_UV_H #define GRPC_CORE_LIB_IOMGR_TIMER_UV_H +#include + #include "src/core/lib/iomgr/exec_ctx.h" struct grpc_timer { diff --git a/src/core/lib/iomgr/udp_server.cc b/src/core/lib/iomgr/udp_server.cc index eecb3b09d97..ec65497d792 100644 --- a/src/core/lib/iomgr/udp_server.cc +++ b/src/core/lib/iomgr/udp_server.cc @@ -25,6 +25,8 @@ #define SO_RXQ_OVFL 40 #endif +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET diff --git a/src/core/lib/iomgr/udp_server.h b/src/core/lib/iomgr/udp_server.h index c1aa49f15dd..1be4d04dbb3 100644 --- a/src/core/lib/iomgr/udp_server.h +++ b/src/core/lib/iomgr/udp_server.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_UDP_SERVER_H #define GRPC_CORE_LIB_IOMGR_UDP_SERVER_H +#include + #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc index b603916c476..8d252fd3318 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.cc +++ b/src/core/lib/iomgr/unix_sockets_posix.cc @@ -15,6 +15,8 @@ * limitations under the License. * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_HAVE_UNIX_SOCKET diff --git a/src/core/lib/iomgr/unix_sockets_posix.h b/src/core/lib/iomgr/unix_sockets_posix.h index 1c079e6e765..917d0327a96 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.h +++ b/src/core/lib/iomgr/unix_sockets_posix.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H #define GRPC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H +#include + #include "src/core/lib/iomgr/port.h" #include diff --git a/src/core/lib/iomgr/unix_sockets_posix_noop.cc b/src/core/lib/iomgr/unix_sockets_posix_noop.cc index fbd9602e1b1..dfab3e0acbc 100644 --- a/src/core/lib/iomgr/unix_sockets_posix_noop.cc +++ b/src/core/lib/iomgr/unix_sockets_posix_noop.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/unix_sockets_posix.h" #ifndef GRPC_HAVE_UNIX_SOCKET diff --git a/src/core/lib/iomgr/wakeup_fd_cv.cc b/src/core/lib/iomgr/wakeup_fd_cv.cc index 41d35cb1fd5..ee322105aee 100644 --- a/src/core/lib/iomgr/wakeup_fd_cv.cc +++ b/src/core/lib/iomgr/wakeup_fd_cv.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_WAKEUP_FD diff --git a/src/core/lib/iomgr/wakeup_fd_cv.h b/src/core/lib/iomgr/wakeup_fd_cv.h index 399620af764..86365f07e17 100644 --- a/src/core/lib/iomgr/wakeup_fd_cv.h +++ b/src/core/lib/iomgr/wakeup_fd_cv.h @@ -33,6 +33,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_WAKEUP_FD_CV_H #define GRPC_CORE_LIB_IOMGR_WAKEUP_FD_CV_H +#include + #include #include "src/core/lib/iomgr/ev_posix.h" diff --git a/src/core/lib/iomgr/wakeup_fd_eventfd.cc b/src/core/lib/iomgr/wakeup_fd_eventfd.cc index 421ac55b00b..dcf7dab71fb 100644 --- a/src/core/lib/iomgr/wakeup_fd_eventfd.cc +++ b/src/core/lib/iomgr/wakeup_fd_eventfd.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_LINUX_EVENTFD diff --git a/src/core/lib/iomgr/wakeup_fd_nospecial.cc b/src/core/lib/iomgr/wakeup_fd_nospecial.cc index c2b525a2544..64778929f00 100644 --- a/src/core/lib/iomgr/wakeup_fd_nospecial.cc +++ b/src/core/lib/iomgr/wakeup_fd_nospecial.cc @@ -21,6 +21,8 @@ * systems without anything better than pipe. */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_NO_SPECIAL_WAKEUP_FD diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.cc b/src/core/lib/iomgr/wakeup_fd_pipe.cc index 05d69dc9cc6..cb173903a93 100644 --- a/src/core/lib/iomgr/wakeup_fd_pipe.cc +++ b/src/core/lib/iomgr/wakeup_fd_pipe.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_WAKEUP_FD diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.h b/src/core/lib/iomgr/wakeup_fd_pipe.h index 326a0c4e01d..17569763059 100644 --- a/src/core/lib/iomgr/wakeup_fd_pipe.h +++ b/src/core/lib/iomgr/wakeup_fd_pipe.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_WAKEUP_FD_PIPE_H #define GRPC_CORE_LIB_IOMGR_WAKEUP_FD_PIPE_H +#include + #include "src/core/lib/iomgr/wakeup_fd_posix.h" extern const grpc_wakeup_fd_vtable grpc_pipe_wakeup_fd_vtable; diff --git a/src/core/lib/iomgr/wakeup_fd_posix.cc b/src/core/lib/iomgr/wakeup_fd_posix.cc index e8de208a25b..b5b8b37a9af 100644 --- a/src/core/lib/iomgr/wakeup_fd_posix.cc +++ b/src/core/lib/iomgr/wakeup_fd_posix.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_WAKEUP_FD diff --git a/src/core/lib/iomgr/wakeup_fd_posix.h b/src/core/lib/iomgr/wakeup_fd_posix.h index a9584d0d489..670c319593b 100644 --- a/src/core/lib/iomgr/wakeup_fd_posix.h +++ b/src/core/lib/iomgr/wakeup_fd_posix.h @@ -47,6 +47,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_WAKEUP_FD_POSIX_H #define GRPC_CORE_LIB_IOMGR_WAKEUP_FD_POSIX_H +#include + #include "src/core/lib/iomgr/error.h" void grpc_wakeup_fd_global_init(void); diff --git a/src/core/lib/json/json.cc b/src/core/lib/json/json.cc index adf35b90889..2141db4c5b0 100644 --- a/src/core/lib/json/json.cc +++ b/src/core/lib/json/json.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/json/json.h b/src/core/lib/json/json.h index bbd43025eb8..3a62ef9cfbc 100644 --- a/src/core/lib/json/json.h +++ b/src/core/lib/json/json.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_JSON_JSON_H #define GRPC_CORE_LIB_JSON_JSON_H +#include + #include #include "src/core/lib/json/json_common.h" diff --git a/src/core/lib/json/json_reader.cc b/src/core/lib/json/json_reader.cc index 6dadea5006c..819572e4dea 100644 --- a/src/core/lib/json/json_reader.cc +++ b/src/core/lib/json/json_reader.cc @@ -16,10 +16,10 @@ * */ -#include - #include +#include + #include #include "src/core/lib/json/json_reader.h" diff --git a/src/core/lib/json/json_reader.h b/src/core/lib/json/json_reader.h index 03185cb2b65..78f7ad9f3a8 100644 --- a/src/core/lib/json/json_reader.h +++ b/src/core/lib/json/json_reader.h @@ -20,6 +20,7 @@ #define GRPC_CORE_LIB_JSON_JSON_READER_H #include + #include "src/core/lib/json/json_common.h" typedef enum { diff --git a/src/core/lib/json/json_string.cc b/src/core/lib/json/json_string.cc index 8200900956e..4f9175b9e7a 100644 --- a/src/core/lib/json/json_string.cc +++ b/src/core/lib/json/json_string.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/json/json_writer.cc b/src/core/lib/json/json_writer.cc index 6d442b8716e..7bbdccc7a37 100644 --- a/src/core/lib/json/json_writer.cc +++ b/src/core/lib/json/json_writer.cc @@ -16,10 +16,10 @@ * */ -#include - #include +#include + #include "src/core/lib/json/json_writer.h" static void json_writer_output_char(grpc_json_writer* writer, char c) { diff --git a/src/core/lib/json/json_writer.h b/src/core/lib/json/json_writer.h index a4f2d4daeb3..ba0bedde7fa 100644 --- a/src/core/lib/json/json_writer.h +++ b/src/core/lib/json/json_writer.h @@ -31,6 +31,8 @@ #ifndef GRPC_CORE_LIB_JSON_JSON_WRITER_H #define GRPC_CORE_LIB_JSON_JSON_WRITER_H +#include + #include #include "src/core/lib/json/json_common.h" diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index c7e212bb212..14051a3f008 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h index 34f8c2487eb..e782e4f28fe 100644 --- a/src/core/lib/security/context/security_context.h +++ b/src/core/lib/security/context/security_context.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H #define GRPC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H +#include + #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index ea2c4e208ff..b8f409260f0 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/composite/composite_credentials.h" #include diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h index 11990d38ff7..a952ad57f1e 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.h +++ b/src/core/lib/security/credentials/composite/composite_credentials.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H +#include + #include "src/core/lib/security/credentials/credentials.h" typedef struct { diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 17f7de58bef..c43cb440ebf 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/credentials.h" #include diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index 50beca897ee..b1421e83c5f 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H +#include + #include #include #include diff --git a/src/core/lib/security/credentials/credentials_metadata.cc b/src/core/lib/security/credentials/credentials_metadata.cc index 250e3841555..703de4aaafd 100644 --- a/src/core/lib/security/credentials/credentials_metadata.cc +++ b/src/core/lib/security/credentials/credentials_metadata.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/credentials.h" #include diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index fa0f89c5837..46311fa122c 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h index 0e9ff155d89..5166e43167f 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.h +++ b/src/core/lib/security/credentials/fake/fake_credentials.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H +#include + #include "src/core/lib/security/credentials/credentials.h" /* -- Fake transport security credentials. -- */ diff --git a/src/core/lib/security/credentials/google_default/credentials_generic.cc b/src/core/lib/security/credentials/google_default/credentials_generic.cc index 15ae9d64280..10ff0f620f9 100644 --- a/src/core/lib/security/credentials/google_default/credentials_generic.cc +++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/google_default/google_default_credentials.h" #include diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 65455f94b39..70d4c3ea51a 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/credentials.h" #include diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 7f19fbc7855..5d92fa88c45 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/iam/iam_credentials.h" #include diff --git a/src/core/lib/security/credentials/iam/iam_credentials.h b/src/core/lib/security/credentials/iam/iam_credentials.h index 5e3cf65bad4..a45710fe0f8 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.h +++ b/src/core/lib/security/credentials/iam/iam_credentials.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_IAM_IAM_CREDENTIALS_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_IAM_IAM_CREDENTIALS_H +#include + #include "src/core/lib/security/credentials/credentials.h" typedef struct { diff --git a/src/core/lib/security/credentials/jwt/json_token.cc b/src/core/lib/security/credentials/jwt/json_token.cc index f7c9f578089..1c4827df0fc 100644 --- a/src/core/lib/security/credentials/jwt/json_token.cc +++ b/src/core/lib/security/credentials/jwt/json_token.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/jwt/json_token.h" #include diff --git a/src/core/lib/security/credentials/jwt/json_token.h b/src/core/lib/security/credentials/jwt/json_token.h index 9b774882b76..d0fb4ebd0a0 100644 --- a/src/core/lib/security/credentials/jwt/json_token.h +++ b/src/core/lib/security/credentials/jwt/json_token.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H +#include + #include #include diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index f58a8b67bad..5c3d34aa566 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H +#include + #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/jwt/json_token.h" diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index f5c1ada6ca7..5c47276e32f 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/jwt/jwt_verifier.h" #include diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index b3805e75cda..cdb09870bd5 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_VERIFIER_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_VERIFIER_H +#include + #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/json/json.h" diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index afae7d8f2fe..2129029737e 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" #include diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index e5b8df8eb94..c0dd1546e3d 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H +#include + #include "src/core/lib/json/json.h" #include "src/core/lib/security/credentials/credentials.h" diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index ddb86e153ba..73946ce039b 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/plugin/plugin_credentials.h" #include diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.h b/src/core/lib/security/credentials/plugin/plugin_credentials.h index e1467b08247..caf990efa15 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.h +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_PLUGIN_PLUGIN_CREDENTIALS_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_PLUGIN_PLUGIN_CREDENTIALS_H +#include + #include "src/core/lib/security/credentials/credentials.h" extern grpc_core::TraceFlag grpc_plugin_credentials_trace; diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index a4fce25f3ac..252b25bc0a4 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" #include diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h index 00039058572..712d34c7331 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.h +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h @@ -18,6 +18,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_SSL_SSL_CREDENTIALS_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_SSL_SSL_CREDENTIALS_H +#include + #include "src/core/lib/security/credentials/credentials.h" typedef struct { diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc index eb88045711a..b01fd6f7693 100644 --- a/src/core/lib/security/security_connector/security_connector.cc +++ b/src/core/lib/security/security_connector/security_connector.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/security_connector/security_connector.h" #include diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h index 0c972a71250..130c8ecd3e0 100644 --- a/src/core/lib/security/security_connector/security_connector.h +++ b/src/core/lib/security/security_connector/security_connector.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SECURITY_CONNECTOR_H #define GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SECURITY_CONNECTOR_H +#include + #include #include diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h index e999a027aeb..af2104cfbcd 100644 --- a/src/core/lib/security/transport/auth_filters.h +++ b/src/core/lib/security/transport/auth_filters.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_TRANSPORT_AUTH_FILTERS_H #define GRPC_CORE_LIB_SECURITY_TRANSPORT_AUTH_FILTERS_H +#include + #include #include "src/core/lib/channel/channel_stack.h" diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index 506f5a06661..d6ca8ee8f8f 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/transport/auth_filters.h" #include diff --git a/src/core/lib/security/transport/lb_targets_info.cc b/src/core/lib/security/transport/lb_targets_info.cc index 67a3c7449d6..155a91e5566 100644 --- a/src/core/lib/security/transport/lb_targets_info.cc +++ b/src/core/lib/security/transport/lb_targets_info.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/lib/security/transport/lb_targets_info.h b/src/core/lib/security/transport/lb_targets_info.h index 7543d3c012f..7e816c5222a 100644 --- a/src/core/lib/security/transport/lb_targets_info.h +++ b/src/core/lib/security/transport/lb_targets_info.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_TRANSPORT_LB_TARGETS_INFO_H #define GRPC_CORE_LIB_SECURITY_TRANSPORT_LB_TARGETS_INFO_H +#include + #include "src/core/lib/slice/slice_hash_table.h" /** Return a channel argument containing \a targets_info. */ diff --git a/src/core/lib/security/transport/secure_endpoint.cc b/src/core/lib/security/transport/secure_endpoint.cc index f72f8b61212..31b779e3337 100644 --- a/src/core/lib/security/transport/secure_endpoint.cc +++ b/src/core/lib/security/transport/secure_endpoint.cc @@ -20,6 +20,8 @@ using that endpoint. Because of various transitive includes in uv.h, including windows.h on Windows, uv.h must be included before other system headers. Therefore, sockaddr.h must always be included first */ +#include + #include "src/core/lib/iomgr/sockaddr.h" #include diff --git a/src/core/lib/security/transport/secure_endpoint.h b/src/core/lib/security/transport/secure_endpoint.h index b2556a01821..e7e33516789 100644 --- a/src/core/lib/security/transport/secure_endpoint.h +++ b/src/core/lib/security/transport/secure_endpoint.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_TRANSPORT_SECURE_ENDPOINT_H #define GRPC_CORE_LIB_SECURITY_TRANSPORT_SECURE_ENDPOINT_H +#include + #include #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index b37392ab81e..0c97dfa6b3a 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/transport/security_handshaker.h" #include diff --git a/src/core/lib/security/transport/security_handshaker.h b/src/core/lib/security/transport/security_handshaker.h index f109a519969..ecf59ec5c54 100644 --- a/src/core/lib/security/transport/security_handshaker.h +++ b/src/core/lib/security/transport/security_handshaker.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_TRANSPORT_SECURITY_HANDSHAKER_H #define GRPC_CORE_LIB_SECURITY_TRANSPORT_SECURITY_HANDSHAKER_H +#include + #include "src/core/lib/channel/handshaker.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/security/security_connector/security_connector.h" diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 409aded6501..a560a4a02e9 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/security/transport/tsi_error.cc b/src/core/lib/security/transport/tsi_error.cc index f71696d35da..f78bb8df38f 100644 --- a/src/core/lib/security/transport/tsi_error.cc +++ b/src/core/lib/security/transport/tsi_error.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/transport/tsi_error.h" grpc_error* grpc_set_tsi_error_result(grpc_error* error, tsi_result result) { diff --git a/src/core/lib/security/transport/tsi_error.h b/src/core/lib/security/transport/tsi_error.h index 8fa6c480acd..16e04f70f1e 100644 --- a/src/core/lib/security/transport/tsi_error.h +++ b/src/core/lib/security/transport/tsi_error.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H #define GRPC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H +#include + #include "src/core/lib/iomgr/error.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/lib/security/util/json_util.cc b/src/core/lib/security/util/json_util.cc index fef1a1f51d2..75512a19c9b 100644 --- a/src/core/lib/security/util/json_util.cc +++ b/src/core/lib/security/util/json_util.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/security/util/json_util.h" #include diff --git a/src/core/lib/security/util/json_util.h b/src/core/lib/security/util/json_util.h index b7e46d40627..89deffcc081 100644 --- a/src/core/lib/security/util/json_util.h +++ b/src/core/lib/security/util/json_util.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SECURITY_UTIL_JSON_UTIL_H #define GRPC_CORE_LIB_SECURITY_UTIL_JSON_UTIL_H +#include + #include #include "src/core/lib/json/json.h" diff --git a/src/core/lib/slice/b64.cc b/src/core/lib/slice/b64.cc index 3e19b7197ff..27f2724002e 100644 --- a/src/core/lib/slice/b64.cc +++ b/src/core/lib/slice/b64.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/slice/b64.h" #include diff --git a/src/core/lib/slice/b64.h b/src/core/lib/slice/b64.h index 17e7306303d..4475568c25b 100644 --- a/src/core/lib/slice/b64.h +++ b/src/core/lib/slice/b64.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SLICE_B64_H #define GRPC_CORE_LIB_SLICE_B64_H +#include + #include /* Encodes data using base64. It is the caller's responsability to free diff --git a/src/core/lib/slice/percent_encoding.cc b/src/core/lib/slice/percent_encoding.cc index 84fb554454f..45cd2cc47f4 100644 --- a/src/core/lib/slice/percent_encoding.cc +++ b/src/core/lib/slice/percent_encoding.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/slice/percent_encoding.h" #include diff --git a/src/core/lib/slice/percent_encoding.h b/src/core/lib/slice/percent_encoding.h index a1009ff01f3..6b13ffc3fee 100644 --- a/src/core/lib/slice/percent_encoding.h +++ b/src/core/lib/slice/percent_encoding.h @@ -26,6 +26,8 @@ and another which applies percent encoding only to non-http2 header bytes (the 'compatible' variant) */ +#include + #include #include diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index 476d941fbbb..585b41cf916 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/slice/slice_internal.h" #include diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index 0416c9d3716..e418ab10ef0 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -16,9 +16,10 @@ * */ -#include #include +#include + #include #include diff --git a/src/core/lib/slice/slice_hash_table.cc b/src/core/lib/slice/slice_hash_table.cc index 2342e904855..9e323216369 100644 --- a/src/core/lib/slice/slice_hash_table.cc +++ b/src/core/lib/slice/slice_hash_table.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include "src/core/lib/slice/slice_hash_table.h" #include diff --git a/src/core/lib/slice/slice_hash_table.h b/src/core/lib/slice/slice_hash_table.h index db69da662a0..819bb3b5bcd 100644 --- a/src/core/lib/slice/slice_hash_table.h +++ b/src/core/lib/slice/slice_hash_table.h @@ -17,6 +17,8 @@ #ifndef GRPC_CORE_LIB_SLICE_SLICE_HASH_TABLE_H #define GRPC_CORE_LIB_SLICE_SLICE_HASH_TABLE_H +#include + #include "src/core/lib/transport/metadata.h" /** Hash table implementation. diff --git a/src/core/lib/slice/slice_intern.cc b/src/core/lib/slice/slice_intern.cc index 2d633c49031..e53c040e1aa 100644 --- a/src/core/lib/slice/slice_intern.cc +++ b/src/core/lib/slice/slice_intern.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/slice/slice_internal.h" #include diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index 4e9ab802611..065c25c90c9 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SLICE_SLICE_INTERNAL_H #define GRPC_CORE_LIB_SLICE_SLICE_INTERNAL_H +#include + #include #include diff --git a/src/core/lib/slice/slice_string_helpers.cc b/src/core/lib/slice/slice_string_helpers.cc index f91ece3b981..6af9c33eb56 100644 --- a/src/core/lib/slice/slice_string_helpers.cc +++ b/src/core/lib/slice/slice_string_helpers.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/slice/slice_string_helpers.h" #include diff --git a/src/core/lib/slice/slice_string_helpers.h b/src/core/lib/slice/slice_string_helpers.h index 429f9ff4b52..976f72411a8 100644 --- a/src/core/lib/slice/slice_string_helpers.h +++ b/src/core/lib/slice/slice_string_helpers.h @@ -19,12 +19,13 @@ #ifndef GRPC_CORE_LIB_SLICE_SLICE_STRING_HELPERS_H #define GRPC_CORE_LIB_SLICE_SLICE_STRING_HELPERS_H +#include + #include #include #include #include -#include #include "src/core/lib/gpr/string.h" diff --git a/src/core/lib/slice/slice_traits.h b/src/core/lib/slice/slice_traits.h index 4b898bdcd46..ee01916525e 100644 --- a/src/core/lib/slice/slice_traits.h +++ b/src/core/lib/slice/slice_traits.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SLICE_SLICE_TRAITS_H #define GRPC_CORE_LIB_SLICE_SLICE_TRAITS_H +#include + #include #include diff --git a/src/core/lib/surface/api_trace.cc b/src/core/lib/surface/api_trace.cc index 7ab836a9bac..bab5a7910c0 100644 --- a/src/core/lib/surface/api_trace.cc +++ b/src/core/lib/surface/api_trace.cc @@ -16,7 +16,9 @@ * */ -#include "src/core/lib/surface/api_trace.h" +#include + #include "src/core/lib/debug/trace.h" +#include "src/core/lib/surface/api_trace.h" grpc_core::TraceFlag grpc_api_trace(false, "api"); diff --git a/src/core/lib/surface/api_trace.h b/src/core/lib/surface/api_trace.h index a4e11ce1544..72ed830554f 100644 --- a/src/core/lib/surface/api_trace.h +++ b/src/core/lib/surface/api_trace.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_API_TRACE_H #define GRPC_CORE_LIB_SURFACE_API_TRACE_H +#include + #include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc index 01cbf7354ab..fce87dc6110 100644 --- a/src/core/lib/surface/byte_buffer.cc +++ b/src/core/lib/surface/byte_buffer.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc index f7ea5161c75..a10f1a39330 100644 --- a/src/core/lib/surface/byte_buffer_reader.cc +++ b/src/core/lib/surface/byte_buffer_reader.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index 2d5077525c4..3df745652ab 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include #include diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index 189329ccc40..793cce4efa9 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_CALL_H #define GRPC_CORE_LIB_SURFACE_CALL_H +#include + #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/surface/api_trace.h" diff --git a/src/core/lib/surface/call_details.cc b/src/core/lib/surface/call_details.cc index cd0b14586a3..7f20b1dae74 100644 --- a/src/core/lib/surface/call_details.cc +++ b/src/core/lib/surface/call_details.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/surface/call_log_batch.cc b/src/core/lib/surface/call_log_batch.cc index d56ea2a9328..f0c82c03570 100644 --- a/src/core/lib/surface/call_log_batch.cc +++ b/src/core/lib/surface/call_log_batch.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/surface/call.h" #include diff --git a/src/core/lib/surface/call_test_only.h b/src/core/lib/surface/call_test_only.h index 9eb32f03fbc..dbd1a866cae 100644 --- a/src/core/lib/surface/call_test_only.h +++ b/src/core/lib/surface/call_test_only.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H #define GRPC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H +#include + #include /** Return the message compression algorithm from \a call. diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index d536027c082..03353d6beb7 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/surface/channel.h" #include diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index 26d8fceb2f8..288313951e4 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_CHANNEL_H #define GRPC_CORE_LIB_SURFACE_CHANNEL_H +#include + #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/surface/channel_stack_type.h" diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc index b1e1dceed34..62eb1c3f9d6 100644 --- a/src/core/lib/surface/channel_init.cc +++ b/src/core/lib/surface/channel_init.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/surface/channel_init.h" #include diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h index d702f0f325c..f01852473ba 100644 --- a/src/core/lib/surface/channel_init.h +++ b/src/core/lib/surface/channel_init.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_CHANNEL_INIT_H #define GRPC_CORE_LIB_SURFACE_CHANNEL_INIT_H +#include + #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/lib/surface/channel_ping.cc b/src/core/lib/surface/channel_ping.cc index 513519d991e..bae945942f2 100644 --- a/src/core/lib/surface/channel_ping.cc +++ b/src/core/lib/surface/channel_ping.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/surface/channel.h" #include diff --git a/src/core/lib/surface/channel_stack_type.cc b/src/core/lib/surface/channel_stack_type.cc index 366c4529427..fcf96ddc9fb 100644 --- a/src/core/lib/surface/channel_stack_type.cc +++ b/src/core/lib/surface/channel_stack_type.cc @@ -16,10 +16,11 @@ * */ -#include "src/core/lib/surface/channel_stack_type.h" -#include #include +#include +#include "src/core/lib/surface/channel_stack_type.h" + bool grpc_channel_stack_type_is_client(grpc_channel_stack_type type) { switch (type) { case GRPC_CLIENT_CHANNEL: diff --git a/src/core/lib/surface/channel_stack_type.h b/src/core/lib/surface/channel_stack_type.h index 52f85a64069..8a3c08e1cce 100644 --- a/src/core/lib/surface/channel_stack_type.h +++ b/src/core/lib/surface/channel_stack_type.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_CHANNEL_STACK_TYPE_H #define GRPC_CORE_LIB_SURFACE_CHANNEL_STACK_TYPE_H +#include + #include typedef enum { diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index aea47afaf52..c9dc2d93c1d 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -21,6 +21,8 @@ /* Internal API for completion queues */ +#include + #include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/pollset.h" diff --git a/src/core/lib/surface/completion_queue_factory.cc b/src/core/lib/surface/completion_queue_factory.cc index d0bb065c8f6..51c1183c5f4 100644 --- a/src/core/lib/surface/completion_queue_factory.cc +++ b/src/core/lib/surface/completion_queue_factory.cc @@ -16,8 +16,10 @@ * */ -#include "src/core/lib/surface/completion_queue_factory.h" +#include + #include "src/core/lib/surface/completion_queue.h" +#include "src/core/lib/surface/completion_queue_factory.h" #include diff --git a/src/core/lib/surface/completion_queue_factory.h b/src/core/lib/surface/completion_queue_factory.h index 89be8f8216a..d2b30a9ce19 100644 --- a/src/core/lib/surface/completion_queue_factory.h +++ b/src/core/lib/surface/completion_queue_factory.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_COMPLETION_QUEUE_FACTORY_H #define GRPC_CORE_LIB_SURFACE_COMPLETION_QUEUE_FACTORY_H +#include + #include #include "src/core/lib/surface/completion_queue.h" diff --git a/src/core/lib/surface/event_string.cc b/src/core/lib/surface/event_string.cc index 7f40bb2405e..d639baec455 100644 --- a/src/core/lib/surface/event_string.cc +++ b/src/core/lib/surface/event_string.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/surface/event_string.h" #include diff --git a/src/core/lib/surface/event_string.h b/src/core/lib/surface/event_string.h index cbf96da6c5d..e6095705e9b 100644 --- a/src/core/lib/surface/event_string.h +++ b/src/core/lib/surface/event_string.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_EVENT_STRING_H #define GRPC_CORE_LIB_SURFACE_EVENT_STRING_H +#include + #include /* Returns a string describing an event. Must be later freed with gpr_free() */ diff --git a/src/core/lib/surface/init_unsecure.cc b/src/core/lib/surface/init_unsecure.cc index b852cab985e..2b3bc643820 100644 --- a/src/core/lib/surface/init_unsecure.cc +++ b/src/core/lib/surface/init_unsecure.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/surface/init.h" void grpc_security_pre_init(void) {} diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index a1f1cf11070..f5aca91f978 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/surface/lame_client.h b/src/core/lib/surface/lame_client.h index 3ce353f101f..aefa67c24a6 100644 --- a/src/core/lib/surface/lame_client.h +++ b/src/core/lib/surface/lame_client.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_LAME_CLIENT_H #define GRPC_CORE_LIB_SURFACE_LAME_CLIENT_H +#include + #include "src/core/lib/channel/channel_stack.h" extern const grpc_channel_filter grpc_lame_filter; diff --git a/src/core/lib/surface/metadata_array.cc b/src/core/lib/surface/metadata_array.cc index 0afb8b4b879..f794a2bb952 100644 --- a/src/core/lib/surface/metadata_array.cc +++ b/src/core/lib/surface/metadata_array.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index d71a23a5d75..f7505c888ec 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/surface/server.h" #include diff --git a/src/core/lib/surface/server.h b/src/core/lib/surface/server.h index 63b6dff16b8..c617cc223e0 100644 --- a/src/core/lib/surface/server.h +++ b/src/core/lib/surface/server.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_SERVER_H #define GRPC_CORE_LIB_SURFACE_SERVER_H +#include + #include #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/surface/validate_metadata.cc b/src/core/lib/surface/validate_metadata.cc index fc94ea7dbeb..2dd18f3dd3f 100644 --- a/src/core/lib/surface/validate_metadata.cc +++ b/src/core/lib/surface/validate_metadata.cc @@ -16,12 +16,13 @@ * */ +#include + #include #include #include #include -#include #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/surface/validate_metadata.h b/src/core/lib/surface/validate_metadata.h index ff074b00b2c..e87fb7beedc 100644 --- a/src/core/lib/surface/validate_metadata.h +++ b/src/core/lib/surface/validate_metadata.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_SURFACE_VALIDATE_METADATA_H #define GRPC_CORE_LIB_SURFACE_VALIDATE_METADATA_H +#include + #include #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc index 1710fd5afba..be196a78bc4 100644 --- a/src/core/lib/surface/version.cc +++ b/src/core/lib/surface/version.cc @@ -19,6 +19,8 @@ /* This file is autogenerated from: templates/src/core/surface/version.c.template */ +#include + #include const char* grpc_version_string(void) { return "6.0.0-dev"; } diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc index 70b308230b4..8130535ddde 100644 --- a/src/core/lib/transport/bdp_estimator.cc +++ b/src/core/lib/transport/bdp_estimator.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/transport/bdp_estimator.h" #include diff --git a/src/core/lib/transport/byte_stream.cc b/src/core/lib/transport/byte_stream.cc index b96598c3932..e1751f80108 100644 --- a/src/core/lib/transport/byte_stream.cc +++ b/src/core/lib/transport/byte_stream.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/transport/byte_stream.h" #include diff --git a/src/core/lib/transport/byte_stream.h b/src/core/lib/transport/byte_stream.h index fc12e5686d4..4d3c3c131b0 100644 --- a/src/core/lib/transport/byte_stream.h +++ b/src/core/lib/transport/byte_stream.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_BYTE_STREAM_H #define GRPC_CORE_LIB_TRANSPORT_BYTE_STREAM_H +#include + #include #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index 17f3529a0e8..0122e773ca6 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/transport/connectivity_state.h" #include diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h index c3a50f3211f..421db5aa393 100644 --- a/src/core/lib/transport/connectivity_state.h +++ b/src/core/lib/transport/connectivity_state.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H #define GRPC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H +#include + #include #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc index 79d904315ed..2eff8b29167 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/transport/error_utils.h" #include diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h index 4100f65d6d1..9a46267f38a 100644 --- a/src/core/lib/transport/error_utils.h +++ b/src/core/lib/transport/error_utils.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_ERROR_UTILS_H #define GRPC_CORE_LIB_TRANSPORT_ERROR_UTILS_H +#include + #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/http2_errors.h" diff --git a/src/core/lib/transport/metadata.cc b/src/core/lib/transport/metadata.cc index e06e0b5313c..d10194a2fe7 100644 --- a/src/core/lib/transport/metadata.cc +++ b/src/core/lib/transport/metadata.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/transport/metadata.h" #include diff --git a/src/core/lib/transport/metadata.h b/src/core/lib/transport/metadata.h index 82142ebed86..5e0ecbdb962 100644 --- a/src/core/lib/transport/metadata.h +++ b/src/core/lib/transport/metadata.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_METADATA_H #define GRPC_CORE_LIB_TRANSPORT_METADATA_H +#include + #include #include diff --git a/src/core/lib/transport/metadata_batch.cc b/src/core/lib/transport/metadata_batch.cc index 9c95339ba06..b23f5165165 100644 --- a/src/core/lib/transport/metadata_batch.cc +++ b/src/core/lib/transport/metadata_batch.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/transport/metadata_batch.h" #include diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index 8353a426f83..06fc9ade7e7 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -19,11 +19,12 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_METADATA_BATCH_H #define GRPC_CORE_LIB_TRANSPORT_METADATA_BATCH_H +#include + #include #include #include -#include #include #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/static_metadata.h" diff --git a/src/core/lib/transport/pid_controller.cc b/src/core/lib/transport/pid_controller.cc index b33ea63df67..dbc98f4917f 100644 --- a/src/core/lib/transport/pid_controller.cc +++ b/src/core/lib/transport/pid_controller.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/transport/pid_controller.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/transport/pid_controller.h b/src/core/lib/transport/pid_controller.h index 87e59a1a904..e26205bf20d 100644 --- a/src/core/lib/transport/pid_controller.h +++ b/src/core/lib/transport/pid_controller.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H #define GRPC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H +#include + #include /* \file Simple PID controller. diff --git a/src/core/lib/transport/service_config.cc b/src/core/lib/transport/service_config.cc index 75196c5f88a..b1d727419dc 100644 --- a/src/core/lib/transport/service_config.cc +++ b/src/core/lib/transport/service_config.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include "src/core/lib/transport/service_config.h" #include diff --git a/src/core/lib/transport/service_config.h b/src/core/lib/transport/service_config.h index 98554b9f0fc..6517f368026 100644 --- a/src/core/lib/transport/service_config.h +++ b/src/core/lib/transport/service_config.h @@ -17,6 +17,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_SERVICE_CONFIG_H #define GRPC_CORE_LIB_TRANSPORT_SERVICE_CONFIG_H +#include + #include #include "src/core/lib/json/json.h" diff --git a/src/core/lib/transport/static_metadata.cc b/src/core/lib/transport/static_metadata.cc index 5994cbc2654..0e11b6e4e40 100644 --- a/src/core/lib/transport/static_metadata.cc +++ b/src/core/lib/transport/static_metadata.cc @@ -24,6 +24,8 @@ * an explanation of what's going on. */ +#include + #include "src/core/lib/transport/static_metadata.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/lib/transport/static_metadata.h b/src/core/lib/transport/static_metadata.h index 8ce9b21bc13..88d9f9f52c1 100644 --- a/src/core/lib/transport/static_metadata.h +++ b/src/core/lib/transport/static_metadata.h @@ -27,6 +27,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H #define GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H +#include + #include "src/core/lib/transport/metadata.h" #define GRPC_STATIC_MDSTR_COUNT 101 diff --git a/src/core/lib/transport/status_conversion.cc b/src/core/lib/transport/status_conversion.cc index 46cba4292b4..e58bef5ba98 100644 --- a/src/core/lib/transport/status_conversion.cc +++ b/src/core/lib/transport/status_conversion.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/transport/status_conversion.h" grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status) { diff --git a/src/core/lib/transport/status_conversion.h b/src/core/lib/transport/status_conversion.h index 107eb92a53d..9f14e9bee03 100644 --- a/src/core/lib/transport/status_conversion.h +++ b/src/core/lib/transport/status_conversion.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_STATUS_CONVERSION_H #define GRPC_CORE_LIB_TRANSPORT_STATUS_CONVERSION_H +#include + #include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/http2_errors.h" diff --git a/src/core/lib/transport/timeout_encoding.cc b/src/core/lib/transport/timeout_encoding.cc index 6800255be2a..c37249920bd 100644 --- a/src/core/lib/transport/timeout_encoding.cc +++ b/src/core/lib/transport/timeout_encoding.cc @@ -16,12 +16,13 @@ * */ +#include + #include "src/core/lib/transport/timeout_encoding.h" #include #include -#include #include "src/core/lib/gpr/string.h" static int64_t round_up(int64_t x, int64_t divisor) { diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h index 4e9268262e4..8505e32ff09 100644 --- a/src/core/lib/transport/timeout_encoding.h +++ b/src/core/lib/transport/timeout_encoding.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H #define GRPC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H +#include + #include #include diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index d71d4fdd76f..c90d16fc32e 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/lib/transport/transport.h" #include diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index b392c696cda..b279ce8c80b 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_TRANSPORT_H #define GRPC_CORE_LIB_TRANSPORT_TRANSPORT_H +#include + #include #include "src/core/lib/channel/context.h" diff --git a/src/core/lib/transport/transport_impl.h b/src/core/lib/transport/transport_impl.h index 50b8a5f9b7f..ba5e05df0af 100644 --- a/src/core/lib/transport/transport_impl.h +++ b/src/core/lib/transport/transport_impl.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H #define GRPC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H +#include + #include "src/core/lib/transport/transport.h" typedef struct grpc_transport_vtable { diff --git a/src/core/plugin_registry/grpc_cronet_plugin_registry.cc b/src/core/plugin_registry/grpc_cronet_plugin_registry.cc index fe5eb28f051..49b9c7d4fed 100644 --- a/src/core/plugin_registry/grpc_cronet_plugin_registry.cc +++ b/src/core/plugin_registry/grpc_cronet_plugin_registry.cc @@ -16,6 +16,8 @@ * */ +#include + #include void grpc_http_filters_init(void); diff --git a/src/core/plugin_registry/grpc_plugin_registry.cc b/src/core/plugin_registry/grpc_plugin_registry.cc index fdf9acc09c2..ccf5f79a8e9 100644 --- a/src/core/plugin_registry/grpc_plugin_registry.cc +++ b/src/core/plugin_registry/grpc_plugin_registry.cc @@ -16,6 +16,8 @@ * */ +#include + #include void grpc_http_filters_init(void); diff --git a/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc b/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc index d73f946241e..b08c5ce3ae9 100644 --- a/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc +++ b/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc @@ -16,6 +16,8 @@ * */ +#include + #include void grpc_http_filters_init(void); diff --git a/src/core/tsi/alts_transport_security.cc b/src/core/tsi/alts_transport_security.cc index 1654d893d08..b45b4e07361 100644 --- a/src/core/tsi/alts_transport_security.cc +++ b/src/core/tsi/alts_transport_security.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/tsi/alts_transport_security.h" #include diff --git a/src/core/tsi/alts_transport_security.h b/src/core/tsi/alts_transport_security.h index 37febd1e28d..3ca064992bb 100644 --- a/src/core/tsi/alts_transport_security.h +++ b/src/core/tsi/alts_transport_security.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H #define GRPC_CORE_TSI_ALTS_TRANSPORT_SECURITY_H +#include + #include #include diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index b5b7203d201..ad08b50ede3 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/tsi/fake_transport_security.h" #include @@ -23,7 +25,6 @@ #include #include -#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/tsi/fake_transport_security.h b/src/core/tsi/fake_transport_security.h index 3848e7c6bf7..37791827e17 100644 --- a/src/core/tsi/fake_transport_security.h +++ b/src/core/tsi/fake_transport_security.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_TSI_FAKE_TRANSPORT_SECURITY_H #define GRPC_CORE_TSI_FAKE_TRANSPORT_SECURITY_H +#include + #include "src/core/tsi/transport_security_interface.h" /* Value for the TSI_CERTIFICATE_TYPE_PEER_PROPERTY property for FAKE certs. */ diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index 29fd59a0e91..971170b7c50 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -16,10 +16,10 @@ * */ -#include "src/core/tsi/ssl_transport_security.h" - #include +#include "src/core/tsi/ssl_transport_security.h" + #include #include diff --git a/src/core/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h index bf211e110a2..edebadc1bee 100644 --- a/src/core/tsi/ssl_transport_security.h +++ b/src/core/tsi/ssl_transport_security.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_TSI_SSL_TRANSPORT_SECURITY_H #define GRPC_CORE_TSI_SSL_TRANSPORT_SECURITY_H +#include + #include "src/core/tsi/transport_security_interface.h" /* Value for the TSI_CERTIFICATE_TYPE_PEER_PROPERTY property for X509 certs. */ diff --git a/src/core/tsi/ssl_types.h b/src/core/tsi/ssl_types.h index 3788643355c..b15d02be390 100644 --- a/src/core/tsi/ssl_types.h +++ b/src/core/tsi/ssl_types.h @@ -27,6 +27,8 @@ * function */ +#include + #include #ifdef OPENSSL_IS_BORINGSSL diff --git a/src/core/tsi/transport_security.cc b/src/core/tsi/transport_security.cc index 0c8e3e9dcc6..129533f7799 100644 --- a/src/core/tsi/transport_security.cc +++ b/src/core/tsi/transport_security.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/tsi/transport_security.h" #include diff --git a/src/core/tsi/transport_security.h b/src/core/tsi/transport_security.h index ed662d48af5..b1ec82d3f77 100644 --- a/src/core/tsi/transport_security.h +++ b/src/core/tsi/transport_security.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_TSI_TRANSPORT_SECURITY_H #define GRPC_CORE_TSI_TRANSPORT_SECURITY_H +#include + #include #include "src/core/lib/debug/trace.h" diff --git a/src/core/tsi/transport_security_adapter.cc b/src/core/tsi/transport_security_adapter.cc index 5f094b3201c..25608f065ab 100644 --- a/src/core/tsi/transport_security_adapter.cc +++ b/src/core/tsi/transport_security_adapter.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/tsi/transport_security_adapter.h" #include diff --git a/src/core/tsi/transport_security_adapter.h b/src/core/tsi/transport_security_adapter.h index 9818fceb865..f83ecc53e5e 100644 --- a/src/core/tsi/transport_security_adapter.h +++ b/src/core/tsi/transport_security_adapter.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_TSI_TRANSPORT_SECURITY_ADAPTER_H #define GRPC_CORE_TSI_TRANSPORT_SECURITY_ADAPTER_H +#include + #include "src/core/tsi/transport_security_interface.h" /* Create a tsi handshaker that takes an implementation of old interface and diff --git a/src/core/tsi/transport_security_grpc.cc b/src/core/tsi/transport_security_grpc.cc index 76f7ae782f2..c73a6e303e6 100644 --- a/src/core/tsi/transport_security_grpc.cc +++ b/src/core/tsi/transport_security_grpc.cc @@ -16,6 +16,8 @@ * */ +#include + #include "src/core/tsi/transport_security_grpc.h" /* This method creates a tsi_zero_copy_grpc_protector object. */ diff --git a/src/core/tsi/transport_security_grpc.h b/src/core/tsi/transport_security_grpc.h index 0156ff1c68a..d3bb04d07fc 100644 --- a/src/core/tsi/transport_security_grpc.h +++ b/src/core/tsi/transport_security_grpc.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_TSI_TRANSPORT_SECURITY_GRPC_H #define GRPC_CORE_TSI_TRANSPORT_SECURITY_GRPC_H +#include + #include #include "src/core/tsi/transport_security.h" diff --git a/src/core/tsi/transport_security_interface.h b/src/core/tsi/transport_security_interface.h index e9255984638..8c10866934f 100644 --- a/src/core/tsi/transport_security_interface.h +++ b/src/core/tsi/transport_security_interface.h @@ -19,6 +19,8 @@ #ifndef GRPC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H #define GRPC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H +#include + #include #include diff --git a/templates/src/core/lib/surface/version.cc.template b/templates/src/core/lib/surface/version.cc.template index d9fa4479db3..0cb31547258 100644 --- a/templates/src/core/lib/surface/version.cc.template +++ b/templates/src/core/lib/surface/version.cc.template @@ -21,6 +21,8 @@ /* This file is autogenerated from: templates/src/core/surface/version.c.template */ + #include + #include const char* grpc_version_string(void) { return "${settings.core_version}"; } diff --git a/templates/src/core/plugin_registry.template b/templates/src/core/plugin_registry.template index 805ae9049f0..a00d204a46c 100644 --- a/templates/src/core/plugin_registry.template +++ b/templates/src/core/plugin_registry.template @@ -22,6 +22,8 @@ template: | * */ + #include + #include %for plugin in selected.plugins: diff --git a/tools/run_tests/sanity/check_port_platform.py b/tools/run_tests/sanity/check_port_platform.py new file mode 100755 index 00000000000..fff828eaee8 --- /dev/null +++ b/tools/run_tests/sanity/check_port_platform.py @@ -0,0 +1,64 @@ +#!/usr/bin/env python + +# 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. + +import os +import sys + +os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '../../..')) + + +def check_port_platform_inclusion(directory_root): + bad_files = [] + for root, dirs, files in os.walk(directory_root): + for filename in files: + path = os.path.join(root, filename) + if os.path.splitext(path)[1] not in ['.c', '.cc', '.h']: continue + if path in [ + os.path.join('include', 'grpc', 'support', + 'port_platform.h'), + os.path.join('include', 'grpc', 'impl', 'codegen', + 'port_platform.h'), + ]: + continue + if filename.endswith('.pb.h') or filename.endswith('.pb.c'): + continue + with open(path) as f: + all_lines_in_file = f.readlines() + for index, l in enumerate(all_lines_in_file): + if '#include' in l: + if l not in [ + '#include \n', + '#include \n' + ]: + bad_files.append(path) + elif all_lines_in_file[index + 1] != '\n': + # Require a blank line after including port_platform.h in + # order to prevent the formatter from reording it's + # inclusion order upon future changes. + bad_files.append(path) + break + return bad_files + + +all_bad_files = [] +all_bad_files += check_port_platform_inclusion(os.path.join('src', 'core')) +all_bad_files += check_port_platform_inclusion(os.path.join('include', 'grpc')) + +if len(all_bad_files) > 0: + for f in all_bad_files: + print(('port_platform.h is not the first included header or there ' + 'is not a blank line following its inclusion in %s') % f) + sys.exit(1) diff --git a/tools/run_tests/sanity/sanity_tests.yaml b/tools/run_tests/sanity/sanity_tests.yaml index 0c1ad9d44d8..a15473db0f2 100644 --- a/tools/run_tests/sanity/sanity_tests.yaml +++ b/tools/run_tests/sanity/sanity_tests.yaml @@ -11,6 +11,7 @@ - script: tools/run_tests/sanity/core_banned_functions.py - script: tools/run_tests/sanity/core_untyped_structs.sh - script: tools/run_tests/sanity/check_deprecated_grpc++.py +- script: tools/run_tests/sanity/check_port_platform.py - script: tools/buildgen/generate_projects.sh -j 3 cpu_cost: 3 - script: tools/distrib/check_copyright.py From 77f77f7e34ab2f735bea7a463b271289057ad3e9 Mon Sep 17 00:00:00 2001 From: Matt Kwong Date: Fri, 23 Feb 2018 14:22:39 -0800 Subject: [PATCH 12/12] Include Boringssl fips_fragments files in headers for building --- grpc.gemspec | 60 +++++++++++++++++++ package.xml | 60 +++++++++++++++++++ src/boringssl/gen_build_yaml.py | 4 +- .../generated/sources_and_headers.json | 60 +++++++++++++++++++ 4 files changed, 183 insertions(+), 1 deletion(-) diff --git a/grpc.gemspec b/grpc.gemspec index 670eee1f257..3899d95864e 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -652,20 +652,80 @@ Gem::Specification.new do |s| s.files += %w( third_party/boringssl/crypto/curve25519/internal.h ) s.files += %w( third_party/boringssl/crypto/err/internal.h ) s.files += %w( third_party/boringssl/crypto/evp/internal.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/aes.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/internal.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/key_wrap.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/aes/mode_wrappers.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/add.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/asm/x86_64-gcc.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/bn.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/bytes.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/cmp.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/ctx.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/div.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/exponentiation.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/gcd.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/generic.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/internal.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/jacobi.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/montgomery.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/montgomery_inv.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/mul.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/prime.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/random.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/shift.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/bn/sqrt.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/aead.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/cipher.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/e_aes.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/e_des.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/cipher/internal.h ) s.files += %w( third_party/boringssl/crypto/fipsmodule/delocate.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/des/des.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/des/internal.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/digest.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/digests.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/internal.h ) s.files += %w( third_party/boringssl/crypto/fipsmodule/digest/md32_common.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec_key.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/ec_montgomery.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/internal.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/oct.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p224-64.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-64.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/simple.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/util-64.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ec/wnaf.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/hmac/hmac.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/md4/md4.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/md5/md5.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/cbc.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/cfb.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/ctr.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/gcm.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/internal.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/ofb.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/modes/polyval.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/internal.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/rand.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/rand/urandom.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/blinding.c ) s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/internal.h ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/padding.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/rsa.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha1-altivec.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha1.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha256.c ) + s.files += %w( third_party/boringssl/crypto/fipsmodule/sha/sha512.c ) s.files += %w( third_party/boringssl/crypto/internal.h ) s.files += %w( third_party/boringssl/crypto/obj/obj_dat.h ) s.files += %w( third_party/boringssl/crypto/pkcs7/internal.h ) diff --git a/package.xml b/package.xml index f847a65446b..ccf20cd9daf 100644 --- a/package.xml +++ b/package.xml @@ -659,20 +659,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/boringssl/gen_build_yaml.py b/src/boringssl/gen_build_yaml.py index 221cbe7fd58..593b66dc4d9 100755 --- a/src/boringssl/gen_build_yaml.py +++ b/src/boringssl/gen_build_yaml.py @@ -67,7 +67,9 @@ class Grpc(object): ), 'headers': sorted( map_dir(f) - for f in files['ssl_headers'] + files['ssl_internal_headers'] + files['crypto_headers'] + files['crypto_internal_headers'] + # We want to include files['fips_fragments'], but not build them as objects. + # See https://boringssl-review.googlesource.com/c/boringssl/+/16946 + for f in files['ssl_headers'] + files['ssl_internal_headers'] + files['crypto_headers'] + files['crypto_internal_headers'] + files['fips_fragments'] ), 'boringssl': True, 'defaults': 'boringssl', diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 93d247944e0..b34fb5332b7 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -7099,20 +7099,80 @@ "third_party/boringssl/crypto/curve25519/internal.h", "third_party/boringssl/crypto/err/internal.h", "third_party/boringssl/crypto/evp/internal.h", + "third_party/boringssl/crypto/fipsmodule/aes/aes.c", "third_party/boringssl/crypto/fipsmodule/aes/internal.h", + "third_party/boringssl/crypto/fipsmodule/aes/key_wrap.c", + "third_party/boringssl/crypto/fipsmodule/aes/mode_wrappers.c", + "third_party/boringssl/crypto/fipsmodule/bn/add.c", + "third_party/boringssl/crypto/fipsmodule/bn/asm/x86_64-gcc.c", + "third_party/boringssl/crypto/fipsmodule/bn/bn.c", + "third_party/boringssl/crypto/fipsmodule/bn/bytes.c", + "third_party/boringssl/crypto/fipsmodule/bn/cmp.c", + "third_party/boringssl/crypto/fipsmodule/bn/ctx.c", + "third_party/boringssl/crypto/fipsmodule/bn/div.c", + "third_party/boringssl/crypto/fipsmodule/bn/exponentiation.c", + "third_party/boringssl/crypto/fipsmodule/bn/gcd.c", + "third_party/boringssl/crypto/fipsmodule/bn/generic.c", "third_party/boringssl/crypto/fipsmodule/bn/internal.h", + "third_party/boringssl/crypto/fipsmodule/bn/jacobi.c", + "third_party/boringssl/crypto/fipsmodule/bn/montgomery.c", + "third_party/boringssl/crypto/fipsmodule/bn/montgomery_inv.c", + "third_party/boringssl/crypto/fipsmodule/bn/mul.c", + "third_party/boringssl/crypto/fipsmodule/bn/prime.c", + "third_party/boringssl/crypto/fipsmodule/bn/random.c", + "third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.c", "third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h", + "third_party/boringssl/crypto/fipsmodule/bn/shift.c", + "third_party/boringssl/crypto/fipsmodule/bn/sqrt.c", + "third_party/boringssl/crypto/fipsmodule/cipher/aead.c", + "third_party/boringssl/crypto/fipsmodule/cipher/cipher.c", + "third_party/boringssl/crypto/fipsmodule/cipher/e_aes.c", + "third_party/boringssl/crypto/fipsmodule/cipher/e_des.c", "third_party/boringssl/crypto/fipsmodule/cipher/internal.h", "third_party/boringssl/crypto/fipsmodule/delocate.h", + "third_party/boringssl/crypto/fipsmodule/des/des.c", "third_party/boringssl/crypto/fipsmodule/des/internal.h", + "third_party/boringssl/crypto/fipsmodule/digest/digest.c", + "third_party/boringssl/crypto/fipsmodule/digest/digests.c", "third_party/boringssl/crypto/fipsmodule/digest/internal.h", "third_party/boringssl/crypto/fipsmodule/digest/md32_common.h", + "third_party/boringssl/crypto/fipsmodule/ec/ec.c", + "third_party/boringssl/crypto/fipsmodule/ec/ec_key.c", + "third_party/boringssl/crypto/fipsmodule/ec/ec_montgomery.c", "third_party/boringssl/crypto/fipsmodule/ec/internal.h", + "third_party/boringssl/crypto/fipsmodule/ec/oct.c", + "third_party/boringssl/crypto/fipsmodule/ec/p224-64.c", + "third_party/boringssl/crypto/fipsmodule/ec/p256-64.c", "third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h", + "third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.c", "third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h", + "third_party/boringssl/crypto/fipsmodule/ec/simple.c", + "third_party/boringssl/crypto/fipsmodule/ec/util-64.c", + "third_party/boringssl/crypto/fipsmodule/ec/wnaf.c", + "third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c", + "third_party/boringssl/crypto/fipsmodule/hmac/hmac.c", + "third_party/boringssl/crypto/fipsmodule/md4/md4.c", + "third_party/boringssl/crypto/fipsmodule/md5/md5.c", + "third_party/boringssl/crypto/fipsmodule/modes/cbc.c", + "third_party/boringssl/crypto/fipsmodule/modes/cfb.c", + "third_party/boringssl/crypto/fipsmodule/modes/ctr.c", + "third_party/boringssl/crypto/fipsmodule/modes/gcm.c", "third_party/boringssl/crypto/fipsmodule/modes/internal.h", + "third_party/boringssl/crypto/fipsmodule/modes/ofb.c", + "third_party/boringssl/crypto/fipsmodule/modes/polyval.c", + "third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg.c", "third_party/boringssl/crypto/fipsmodule/rand/internal.h", + "third_party/boringssl/crypto/fipsmodule/rand/rand.c", + "third_party/boringssl/crypto/fipsmodule/rand/urandom.c", + "third_party/boringssl/crypto/fipsmodule/rsa/blinding.c", "third_party/boringssl/crypto/fipsmodule/rsa/internal.h", + "third_party/boringssl/crypto/fipsmodule/rsa/padding.c", + "third_party/boringssl/crypto/fipsmodule/rsa/rsa.c", + "third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c", + "third_party/boringssl/crypto/fipsmodule/sha/sha1-altivec.c", + "third_party/boringssl/crypto/fipsmodule/sha/sha1.c", + "third_party/boringssl/crypto/fipsmodule/sha/sha256.c", + "third_party/boringssl/crypto/fipsmodule/sha/sha512.c", "third_party/boringssl/crypto/internal.h", "third_party/boringssl/crypto/obj/obj_dat.h", "third_party/boringssl/crypto/pkcs7/internal.h",