Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ignore pb.h, pb.c for clang-fmt

Browse Source
pull/5213/head
Craig Tiller 9 years ago
parent eb841e2010
commit 00c4829669
5 changed files with 121 additions and 204 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 115
      src/core/proto/grpc/lb/v0/load_balancer.pb.c
  2. 75
      src/core/proto/grpc/lb/v0/load_balancer.pb.h
  3. 19
      tools/codegen/core/gen_load_balancing_proto.sh
  4. 16
      tools/distrib/check_nanopb_output.sh
  5. 2
      tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh

115
src/core/proto/grpc/lb/v0/load_balancer.pb.c
Unescape View File

@ -39,74 +39,59 @@
#error Regenerate this file with the current version of nanopb generator.
#endif
const pb_field_t grpc_lb_v0_Duration_fields[3] = {
PB_FIELD(1, INT64, OPTIONAL, STATIC, FIRST, grpc_lb_v0_Duration, seconds,
seconds, 0),
PB_FIELD(2, INT32, OPTIONAL, STATIC, OTHER, grpc_lb_v0_Duration, nanos,
seconds, 0),
PB_LAST_FIELD};
PB_FIELD( 1, INT64 , OPTIONAL, STATIC , FIRST, grpc_lb_v0_Duration, seconds, seconds, 0),
PB_FIELD( 2, INT32 , OPTIONAL, STATIC , OTHER, grpc_lb_v0_Duration, nanos, seconds, 0),
PB_LAST_FIELD
};
const pb_field_t grpc_lb_v0_LoadBalanceRequest_fields[3] = {
PB_FIELD(1, MESSAGE, OPTIONAL, STATIC, FIRST, grpc_lb_v0_LoadBalanceRequest,
initial_request, initial_request,
&grpc_lb_v0_InitialLoadBalanceRequest_fields),
PB_FIELD(2, MESSAGE, OPTIONAL, STATIC, OTHER, grpc_lb_v0_LoadBalanceRequest,
client_stats, initial_request, &grpc_lb_v0_ClientStats_fields),
PB_LAST_FIELD};
PB_FIELD( 1, MESSAGE , OPTIONAL, STATIC , FIRST, grpc_lb_v0_LoadBalanceRequest, initial_request, initial_request, &grpc_lb_v0_InitialLoadBalanceRequest_fields),
PB_FIELD( 2, MESSAGE , OPTIONAL, STATIC , OTHER, grpc_lb_v0_LoadBalanceRequest, client_stats, initial_request, &grpc_lb_v0_ClientStats_fields),
PB_LAST_FIELD
};
const pb_field_t grpc_lb_v0_InitialLoadBalanceRequest_fields[2] = {
PB_FIELD(1, STRING, OPTIONAL, STATIC, FIRST,
grpc_lb_v0_InitialLoadBalanceRequest, name, name, 0),
PB_LAST_FIELD};
PB_FIELD( 1, STRING , OPTIONAL, STATIC , FIRST, grpc_lb_v0_InitialLoadBalanceRequest, name, name, 0),
PB_LAST_FIELD
};
const pb_field_t grpc_lb_v0_ClientStats_fields[4] = {
PB_FIELD(1, INT64, OPTIONAL, STATIC, FIRST, grpc_lb_v0_ClientStats,
total_requests, total_requests, 0),
PB_FIELD(2, INT64, OPTIONAL, STATIC, OTHER, grpc_lb_v0_ClientStats,
client_rpc_errors, total_requests, 0),
PB_FIELD(3, INT64, OPTIONAL, STATIC, OTHER, grpc_lb_v0_ClientStats,
dropped_requests, client_rpc_errors, 0),
PB_LAST_FIELD};
PB_FIELD( 1, INT64 , OPTIONAL, STATIC , FIRST, grpc_lb_v0_ClientStats, total_requests, total_requests, 0),
PB_FIELD( 2, INT64 , OPTIONAL, STATIC , OTHER, grpc_lb_v0_ClientStats, client_rpc_errors, total_requests, 0),
PB_FIELD( 3, INT64 , OPTIONAL, STATIC , OTHER, grpc_lb_v0_ClientStats, dropped_requests, client_rpc_errors, 0),
PB_LAST_FIELD
};
const pb_field_t grpc_lb_v0_LoadBalanceResponse_fields[3] = {
PB_FIELD(1, MESSAGE, OPTIONAL, STATIC, FIRST,
grpc_lb_v0_LoadBalanceResponse, initial_response, initial_response,
&grpc_lb_v0_InitialLoadBalanceResponse_fields),
PB_FIELD(2, MESSAGE, OPTIONAL, STATIC, OTHER,
grpc_lb_v0_LoadBalanceResponse, server_list, initial_response,
&grpc_lb_v0_ServerList_fields),
PB_LAST_FIELD};
PB_FIELD( 1, MESSAGE , OPTIONAL, STATIC , FIRST, grpc_lb_v0_LoadBalanceResponse, initial_response, initial_response, &grpc_lb_v0_InitialLoadBalanceResponse_fields),
PB_FIELD( 2, MESSAGE , OPTIONAL, STATIC , OTHER, grpc_lb_v0_LoadBalanceResponse, server_list, initial_response, &grpc_lb_v0_ServerList_fields),
PB_LAST_FIELD
};
const pb_field_t grpc_lb_v0_InitialLoadBalanceResponse_fields[4] = {
PB_FIELD(1, STRING, OPTIONAL, STATIC, FIRST,
grpc_lb_v0_InitialLoadBalanceResponse, client_config,
client_config, 0),
PB_FIELD(2, STRING, OPTIONAL, STATIC, OTHER,
grpc_lb_v0_InitialLoadBalanceResponse, load_balancer_delegate,
client_config, 0),
PB_FIELD(3, MESSAGE, OPTIONAL, STATIC, OTHER,
grpc_lb_v0_InitialLoadBalanceResponse,
client_stats_report_interval, load_balancer_delegate,
&grpc_lb_v0_Duration_fields),
PB_LAST_FIELD};
PB_FIELD( 1, STRING , OPTIONAL, STATIC , FIRST, grpc_lb_v0_InitialLoadBalanceResponse, client_config, client_config, 0),
PB_FIELD( 2, STRING , OPTIONAL, STATIC , OTHER, grpc_lb_v0_InitialLoadBalanceResponse, load_balancer_delegate, client_config, 0),
PB_FIELD( 3, MESSAGE , OPTIONAL, STATIC , OTHER, grpc_lb_v0_InitialLoadBalanceResponse, client_stats_report_interval, load_balancer_delegate, &grpc_lb_v0_Duration_fields),
PB_LAST_FIELD
};
const pb_field_t grpc_lb_v0_ServerList_fields[3] = {
PB_FIELD(1, MESSAGE, REPEATED, CALLBACK, FIRST, grpc_lb_v0_ServerList,
servers, servers, &grpc_lb_v0_Server_fields),
PB_FIELD(3, MESSAGE, OPTIONAL, STATIC, OTHER, grpc_lb_v0_ServerList,
expiration_interval, servers, &grpc_lb_v0_Duration_fields),
PB_LAST_FIELD};
PB_FIELD( 1, MESSAGE , REPEATED, CALLBACK, FIRST, grpc_lb_v0_ServerList, servers, servers, &grpc_lb_v0_Server_fields),
PB_FIELD( 3, MESSAGE , OPTIONAL, STATIC , OTHER, grpc_lb_v0_ServerList, expiration_interval, servers, &grpc_lb_v0_Duration_fields),
PB_LAST_FIELD
};
const pb_field_t grpc_lb_v0_Server_fields[5] = {
PB_FIELD(1, STRING, OPTIONAL, STATIC, FIRST, grpc_lb_v0_Server, ip_address,
ip_address, 0),
PB_FIELD(2, INT32, OPTIONAL, STATIC, OTHER, grpc_lb_v0_Server, port,
ip_address, 0),
PB_FIELD(3, BYTES, OPTIONAL, STATIC, OTHER, grpc_lb_v0_Server,
load_balance_token, port, 0),
PB_FIELD(4, BOOL, OPTIONAL, STATIC, OTHER, grpc_lb_v0_Server, drop_request,
load_balance_token, 0),
PB_LAST_FIELD};
PB_FIELD( 1, STRING , OPTIONAL, STATIC , FIRST, grpc_lb_v0_Server, ip_address, ip_address, 0),
PB_FIELD( 2, INT32 , OPTIONAL, STATIC , OTHER, grpc_lb_v0_Server, port, ip_address, 0),
PB_FIELD( 3, BYTES , OPTIONAL, STATIC , OTHER, grpc_lb_v0_Server, load_balance_token, port, 0),
PB_FIELD( 4, BOOL , OPTIONAL, STATIC , OTHER, grpc_lb_v0_Server, drop_request, load_balance_token, 0),
PB_LAST_FIELD
};
/* Check that field information fits in pb_field_t */
#if !defined(PB_FIELD_32BIT)
@ -117,16 +102,7 @@ const pb_field_t grpc_lb_v0_Server_fields[5] = {
* numbers or field sizes that are larger than what can fit in 8 or 16 bit
* field descriptors.
*/
PB_STATIC_ASSERT(
(pb_membersize(grpc_lb_v0_LoadBalanceRequest, initial_request) < 65536 &&
pb_membersize(grpc_lb_v0_LoadBalanceRequest, client_stats) < 65536 &&
pb_membersize(grpc_lb_v0_LoadBalanceResponse, initial_response) < 65536 &&
pb_membersize(grpc_lb_v0_LoadBalanceResponse, server_list) < 65536 &&
pb_membersize(grpc_lb_v0_InitialLoadBalanceResponse,
client_stats_report_interval) < 65536 &&
pb_membersize(grpc_lb_v0_ServerList, servers) < 65536 &&
pb_membersize(grpc_lb_v0_ServerList, expiration_interval) < 65536),
YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_grpc_lb_v0_Duration_grpc_lb_v0_LoadBalanceRequest_grpc_lb_v0_InitialLoadBalanceRequest_grpc_lb_v0_ClientStats_grpc_lb_v0_LoadBalanceResponse_grpc_lb_v0_InitialLoadBalanceResponse_grpc_lb_v0_ServerList_grpc_lb_v0_Server)
PB_STATIC_ASSERT((pb_membersize(grpc_lb_v0_LoadBalanceRequest, initial_request) < 65536 && pb_membersize(grpc_lb_v0_LoadBalanceRequest, client_stats) < 65536 && pb_membersize(grpc_lb_v0_LoadBalanceResponse, initial_response) < 65536 && pb_membersize(grpc_lb_v0_LoadBalanceResponse, server_list) < 65536 && pb_membersize(grpc_lb_v0_InitialLoadBalanceResponse, client_stats_report_interval) < 65536 && pb_membersize(grpc_lb_v0_ServerList, servers) < 65536 && pb_membersize(grpc_lb_v0_ServerList, expiration_interval) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_grpc_lb_v0_Duration_grpc_lb_v0_LoadBalanceRequest_grpc_lb_v0_InitialLoadBalanceRequest_grpc_lb_v0_ClientStats_grpc_lb_v0_LoadBalanceResponse_grpc_lb_v0_InitialLoadBalanceResponse_grpc_lb_v0_ServerList_grpc_lb_v0_Server)
#endif
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
@ -137,14 +113,7 @@ PB_STATIC_ASSERT(
* numbers or field sizes that are larger than what can fit in the default
* 8 bit descriptors.
*/
PB_STATIC_ASSERT(
(pb_membersize(grpc_lb_v0_LoadBalanceRequest, initial_request) < 256 &&
pb_membersize(grpc_lb_v0_LoadBalanceRequest, client_stats) < 256 &&
pb_membersize(grpc_lb_v0_LoadBalanceResponse, initial_response) < 256 &&
pb_membersize(grpc_lb_v0_LoadBalanceResponse, server_list) < 256 &&
pb_membersize(grpc_lb_v0_InitialLoadBalanceResponse,
client_stats_report_interval) < 256 &&
pb_membersize(grpc_lb_v0_ServerList, servers) < 256 &&
pb_membersize(grpc_lb_v0_ServerList, expiration_interval) < 256),
YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_grpc_lb_v0_Duration_grpc_lb_v0_LoadBalanceRequest_grpc_lb_v0_InitialLoadBalanceRequest_grpc_lb_v0_ClientStats_grpc_lb_v0_LoadBalanceResponse_grpc_lb_v0_InitialLoadBalanceResponse_grpc_lb_v0_ServerList_grpc_lb_v0_Server)
PB_STATIC_ASSERT((pb_membersize(grpc_lb_v0_LoadBalanceRequest, initial_request) < 256 && pb_membersize(grpc_lb_v0_LoadBalanceRequest, client_stats) < 256 && pb_membersize(grpc_lb_v0_LoadBalanceResponse, initial_response) < 256 && pb_membersize(grpc_lb_v0_LoadBalanceResponse, server_list) < 256 && pb_membersize(grpc_lb_v0_InitialLoadBalanceResponse, client_stats_report_interval) < 256 && pb_membersize(grpc_lb_v0_ServerList, servers) < 256 && pb_membersize(grpc_lb_v0_ServerList, expiration_interval) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_grpc_lb_v0_Duration_grpc_lb_v0_LoadBalanceRequest_grpc_lb_v0_InitialLoadBalanceRequest_grpc_lb_v0_ClientStats_grpc_lb_v0_LoadBalanceResponse_grpc_lb_v0_InitialLoadBalanceResponse_grpc_lb_v0_ServerList_grpc_lb_v0_Server)
#endif

75
src/core/proto/grpc/lb/v0/load_balancer.pb.h
Unescape View File

@ -111,62 +111,22 @@ typedef struct _grpc_lb_v0_LoadBalanceResponse {
/* Default values for struct fields */
/* Initializer values for message structs */
#define grpc_lb_v0_Duration_init_default \
{ false, 0, false, 0 }
#define grpc_lb_v0_LoadBalanceRequest_init_default \
{ \
false, grpc_lb_v0_InitialLoadBalanceRequest_init_default, false, \
grpc_lb_v0_ClientStats_init_default \
}
#define grpc_lb_v0_InitialLoadBalanceRequest_init_default \
{ false, "" }
#define grpc_lb_v0_ClientStats_init_default \
{ false, 0, false, 0, false, 0 }
#define grpc_lb_v0_LoadBalanceResponse_init_default \
{ \
false, grpc_lb_v0_InitialLoadBalanceResponse_init_default, false, \
grpc_lb_v0_ServerList_init_default \
}
#define grpc_lb_v0_InitialLoadBalanceResponse_init_default \
{ false, "", false, "", false, grpc_lb_v0_Duration_init_default }
#define grpc_lb_v0_ServerList_init_default \
{ \
{ \
{ NULL } \
, NULL \
} \
, false, grpc_lb_v0_Duration_init_default \
}
#define grpc_lb_v0_Server_init_default \
{ false, "", false, 0, false, {0, {0}}, false, 0 }
#define grpc_lb_v0_Duration_init_zero \
{ false, 0, false, 0 }
#define grpc_lb_v0_LoadBalanceRequest_init_zero \
{ \
false, grpc_lb_v0_InitialLoadBalanceRequest_init_zero, false, \
grpc_lb_v0_ClientStats_init_zero \
}
#define grpc_lb_v0_InitialLoadBalanceRequest_init_zero \
{ false, "" }
#define grpc_lb_v0_ClientStats_init_zero \
{ false, 0, false, 0, false, 0 }
#define grpc_lb_v0_LoadBalanceResponse_init_zero \
{ \
false, grpc_lb_v0_InitialLoadBalanceResponse_init_zero, false, \
grpc_lb_v0_ServerList_init_zero \
}
#define grpc_lb_v0_InitialLoadBalanceResponse_init_zero \
{ false, "", false, "", false, grpc_lb_v0_Duration_init_zero }
#define grpc_lb_v0_ServerList_init_zero \
{ \
{ \
{ NULL } \
, NULL \
} \
, false, grpc_lb_v0_Duration_init_zero \
}
#define grpc_lb_v0_Server_init_zero \
{ false, "", false, 0, false, {0, {0}}, false, 0 }
#define grpc_lb_v0_Duration_init_default {false, 0, false, 0}
#define grpc_lb_v0_LoadBalanceRequest_init_default {false, grpc_lb_v0_InitialLoadBalanceRequest_init_default, false, grpc_lb_v0_ClientStats_init_default}
#define grpc_lb_v0_InitialLoadBalanceRequest_init_default {false, ""}
#define grpc_lb_v0_ClientStats_init_default {false, 0, false, 0, false, 0}
#define grpc_lb_v0_LoadBalanceResponse_init_default {false, grpc_lb_v0_InitialLoadBalanceResponse_init_default, false, grpc_lb_v0_ServerList_init_default}
#define grpc_lb_v0_InitialLoadBalanceResponse_init_default {false, "", false, "", false, grpc_lb_v0_Duration_init_default}
#define grpc_lb_v0_ServerList_init_default {{{NULL}, NULL}, false, grpc_lb_v0_Duration_init_default}
#define grpc_lb_v0_Server_init_default {false, "", false, 0, false, {0, {0}}, false, 0}
#define grpc_lb_v0_Duration_init_zero {false, 0, false, 0}
#define grpc_lb_v0_LoadBalanceRequest_init_zero {false, grpc_lb_v0_InitialLoadBalanceRequest_init_zero, false, grpc_lb_v0_ClientStats_init_zero}
#define grpc_lb_v0_InitialLoadBalanceRequest_init_zero {false, ""}
#define grpc_lb_v0_ClientStats_init_zero {false, 0, false, 0, false, 0}
#define grpc_lb_v0_LoadBalanceResponse_init_zero {false, grpc_lb_v0_InitialLoadBalanceResponse_init_zero, false, grpc_lb_v0_ServerList_init_zero}
#define grpc_lb_v0_InitialLoadBalanceResponse_init_zero {false, "", false, "", false, grpc_lb_v0_Duration_init_zero}
#define grpc_lb_v0_ServerList_init_zero {{{NULL}, NULL}, false, grpc_lb_v0_Duration_init_zero}
#define grpc_lb_v0_Server_init_zero {false, "", false, 0, false, {0, {0}}, false, 0}
/* Field tags (for use in manual encoding/decoding) */
#define grpc_lb_v0_ClientStats_total_requests_tag 1
@ -210,7 +170,8 @@ extern const pb_field_t grpc_lb_v0_Server_fields[5];
/* Message IDs (where set with "msgid" option) */
#ifdef PB_MSGID
#define LOAD_BALANCER_MESSAGES
#define LOAD_BALANCER_MESSAGES \
#endif

19
tools/codegen/core/gen_load_balancing_proto.sh
Unescape View File

@ -70,9 +70,6 @@ read -r -d '' COPYRIGHT <<'EOF'
EOF
# build clang-format docker image
docker build -t grpc_clang_format tools/dockerfile/grpc_clang_format
CURRENT_YEAR=$(date +%Y)
COPYRIGHT_FILE=$(mktemp)
echo "${COPYRIGHT/<YEAR>/$CURRENT_YEAR}" > $COPYRIGHT_FILE
@ -106,6 +103,15 @@ if [[ ! -f "${EXPECTED_OPTIONS_FILE_PATH}" ]]; then
exit 4
fi
readonly VENV_DIR=$(mktemp -d)
readonly VENV_NAME="nanopb-$(date '+%Y%m%d_%H%M%S_%N')"
pushd $VENV_DIR
virtualenv $VENV_NAME
. $VENV_NAME/bin/activate
popd
pip install protobuf==3.0.0b2
pushd "$(dirname $1)" > /dev/null
protoc \
@ -124,10 +130,7 @@ mv -v $TMPFILE "$OUTPUT_DIR/$PROTO_BASENAME.pb.c"
cat $COPYRIGHT_FILE "$OUTPUT_DIR/$PROTO_BASENAME.pb.h" > $TMPFILE
mv -v $TMPFILE "$OUTPUT_DIR/$PROTO_BASENAME.pb.h"
readonly MOUNTPOINT='/protos'
docker run --rm=true -v ${HOST_GIT_ROOT}/gens/src/proto/grpc/lb/v0:$MOUNTPOINT \
-t grpc_clang_format \
clang-format-3.6 -style="{BasedOnStyle: Google, Language: Cpp}" \
-i $MOUNTPOINT/load_balancer.pb.c $MOUNTPOINT/load_balancer.pb.h
deactivate
rm -rf $VENV_DIR
popd > /dev/null

16
tools/distrib/check_nanopb_output.sh
Unescape View File

@ -33,22 +33,6 @@ set -ex
apt-get install -y autoconf automake libtool curl python-virtualenv
readonly NANOPB_TMP_OUTPUT="${LOCAL_GIT_ROOT}/gens/src/proto/grpc/lb/v0"
readonly VENV_DIR=$(mktemp -d)
# create a virtualenv for nanopb's compiler
pushd $VENV_DIR
readonly VENV_NAME="nanopb-$(date '+%Y%m%d_%H%M%S_%N')"
virtualenv $VENV_NAME
. $VENV_NAME/bin/activate
popd
# install proto3
pip install protobuf==3.0.0b2
# change to root directory
cd $(dirname $0)/../..
# build clang-format docker image
docker build -t grpc_clang_format tools/dockerfile/grpc_clang_format
# install protoc version 3
pushd third_party/protobuf

2
tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh
Unescape View File

@ -44,7 +44,7 @@ for dir in $DIRS
do
for glob in $GLOB
do
files="$files `find /local-code/$dir -name $glob -and -not -name *.generated.*`"
files="$files `find /local-code/$dir -name $glob -and -not -name *.generated.* -and -not -name *.pb.h -and -not -name *.pb.c`"
done
done

Write Preview
Loading…
Cancel
Save