pull/10626/head
Muxi Yan
8 years ago
commit
3136568e36
204 changed files with 2544 additions and 1095 deletions
@ -0,0 +1,103 @@ |
|||||||
|
/*
|
||||||
|
* |
||||||
|
* Copyright 2017, Google Inc. |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or without |
||||||
|
* modification, are permitted provided that the following conditions are |
||||||
|
* met: |
||||||
|
* |
||||||
|
* * Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* * Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following disclaimer |
||||||
|
* in the documentation and/or other materials provided with the |
||||||
|
* distribution. |
||||||
|
* * Neither the name of Google Inc. nor the names of its |
||||||
|
* contributors may be used to endorse or promote products derived from |
||||||
|
* this software without specific prior written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
* |
||||||
|
*/ |
||||||
|
|
||||||
|
#include <string.h> |
||||||
|
|
||||||
|
#include "src/core/ext/filters/http/client/http_client_filter.h" |
||||||
|
#include "src/core/ext/filters/http/message_compress/message_compress_filter.h" |
||||||
|
#include "src/core/ext/filters/http/server/http_server_filter.h" |
||||||
|
#include "src/core/lib/channel/channel_stack_builder.h" |
||||||
|
#include "src/core/lib/surface/channel_init.h" |
||||||
|
#include "src/core/lib/transport/transport_impl.h" |
||||||
|
|
||||||
|
typedef struct { |
||||||
|
const grpc_channel_filter *filter; |
||||||
|
const char *control_channel_arg; |
||||||
|
} optional_filter; |
||||||
|
|
||||||
|
static optional_filter compress_filter = { |
||||||
|
&grpc_message_compress_filter, GRPC_ARG_ENABLE_PER_MESSAGE_COMPRESSION}; |
||||||
|
|
||||||
|
static bool is_building_http_like_transport( |
||||||
|
grpc_channel_stack_builder *builder) { |
||||||
|
grpc_transport *t = grpc_channel_stack_builder_get_transport(builder); |
||||||
|
return t != NULL && strstr(t->vtable->name, "http"); |
||||||
|
} |
||||||
|
|
||||||
|
static bool maybe_add_optional_filter(grpc_exec_ctx *exec_ctx, |
||||||
|
grpc_channel_stack_builder *builder, |
||||||
|
void *arg) { |
||||||
|
if (!is_building_http_like_transport(builder)) return true; |
||||||
|
optional_filter *filtarg = arg; |
||||||
|
const grpc_channel_args *channel_args = |
||||||
|
grpc_channel_stack_builder_get_channel_arguments(builder); |
||||||
|
bool enable = grpc_channel_arg_get_bool( |
||||||
|
grpc_channel_args_find(channel_args, filtarg->control_channel_arg), |
||||||
|
!grpc_channel_args_want_minimal_stack(channel_args)); |
||||||
|
return enable ? grpc_channel_stack_builder_prepend_filter( |
||||||
|
builder, filtarg->filter, NULL, NULL) |
||||||
|
: true; |
||||||
|
} |
||||||
|
|
||||||
|
static bool maybe_add_required_filter(grpc_exec_ctx *exec_ctx, |
||||||
|
grpc_channel_stack_builder *builder, |
||||||
|
void *arg) { |
||||||
|
return is_building_http_like_transport(builder) |
||||||
|
? grpc_channel_stack_builder_prepend_filter( |
||||||
|
builder, (const grpc_channel_filter *)arg, NULL, NULL) |
||||||
|
: true; |
||||||
|
} |
||||||
|
|
||||||
|
void grpc_http_filters_init(void) { |
||||||
|
grpc_register_tracer("compression", &grpc_compression_trace); |
||||||
|
grpc_channel_init_register_stage(GRPC_CLIENT_SUBCHANNEL, |
||||||
|
GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, |
||||||
|
maybe_add_optional_filter, &compress_filter); |
||||||
|
grpc_channel_init_register_stage(GRPC_CLIENT_DIRECT_CHANNEL, |
||||||
|
GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, |
||||||
|
maybe_add_optional_filter, &compress_filter); |
||||||
|
grpc_channel_init_register_stage(GRPC_SERVER_CHANNEL, |
||||||
|
GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, |
||||||
|
maybe_add_optional_filter, &compress_filter); |
||||||
|
grpc_channel_init_register_stage( |
||||||
|
GRPC_CLIENT_SUBCHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, |
||||||
|
maybe_add_required_filter, (void *)&grpc_http_client_filter); |
||||||
|
grpc_channel_init_register_stage( |
||||||
|
GRPC_CLIENT_DIRECT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, |
||||||
|
maybe_add_required_filter, (void *)&grpc_http_client_filter); |
||||||
|
grpc_channel_init_register_stage( |
||||||
|
GRPC_SERVER_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, |
||||||
|
maybe_add_required_filter, (void *)&grpc_http_server_filter); |
||||||
|
} |
||||||
|
|
||||||
|
void grpc_http_filters_shutdown(void) {} |
||||||
@ -0,0 +1,232 @@ |
|||||||
|
/*
|
||||||
|
* |
||||||
|
* Copyright 2017, Google Inc. |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or without |
||||||
|
* modification, are permitted provided that the following conditions are |
||||||
|
* met: |
||||||
|
* |
||||||
|
* * Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* * Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following disclaimer |
||||||
|
* in the documentation and/or other materials provided with the |
||||||
|
* distribution. |
||||||
|
* * Neither the name of Google Inc. nor the names of its |
||||||
|
* contributors may be used to endorse or promote products derived from |
||||||
|
* this software without specific prior written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
* |
||||||
|
*/ |
||||||
|
|
||||||
|
/*******************************************************************************
|
||||||
|
* This test verifies that various stack configurations result in the set of |
||||||
|
* filters that we expect. |
||||||
|
* |
||||||
|
* This is akin to a golden-file test, and suffers the same disadvantages and |
||||||
|
* advantages: it reflects that the code as written has not been modified - and |
||||||
|
* valid code modifications WILL break this test and it will need updating. |
||||||
|
* |
||||||
|
* The intent therefore is to allow code reviewers to more easily catch changes |
||||||
|
* that perturb the generated list of channel filters in different |
||||||
|
* configurations and assess whether such a change is correct and desirable. |
||||||
|
*/ |
||||||
|
|
||||||
|
#include <grpc/grpc.h> |
||||||
|
#include <grpc/support/alloc.h> |
||||||
|
#include <grpc/support/string_util.h> |
||||||
|
#include <string.h> |
||||||
|
|
||||||
|
#include "src/core/lib/channel/channel_stack_builder.h" |
||||||
|
#include "src/core/lib/support/string.h" |
||||||
|
#include "src/core/lib/surface/channel_init.h" |
||||||
|
#include "src/core/lib/surface/channel_stack_type.h" |
||||||
|
#include "src/core/lib/transport/transport_impl.h" |
||||||
|
#include "test/core/util/test_config.h" |
||||||
|
|
||||||
|
// use CHECK_STACK instead
|
||||||
|
static int check_stack(const char *file, int line, const char *transport_name, |
||||||
|
grpc_channel_args *init_args, |
||||||
|
grpc_channel_stack_type channel_stack_type, ...); |
||||||
|
|
||||||
|
// arguments: const char *transport_name - the name of the transport type to
|
||||||
|
// simulate
|
||||||
|
// grpc_channel_args *init_args - channel args to pass down
|
||||||
|
// grpc_channel_stack_type channel_stack_type - the archetype of
|
||||||
|
// channel stack to create
|
||||||
|
// variadic arguments - the (in-order) expected list of channel
|
||||||
|
// filters to instantiate, terminated with NULL
|
||||||
|
#define CHECK_STACK(...) check_stack(__FILE__, __LINE__, __VA_ARGS__) |
||||||
|
|
||||||
|
int main(int argc, char **argv) { |
||||||
|
grpc_test_init(argc, argv); |
||||||
|
grpc_init(); |
||||||
|
int errors = 0; |
||||||
|
|
||||||
|
// tests with a minimal stack
|
||||||
|
grpc_arg minimal_stack_arg = {.type = GRPC_ARG_INTEGER, |
||||||
|
.key = GRPC_ARG_MINIMAL_STACK, |
||||||
|
.value.integer = 1}; |
||||||
|
grpc_channel_args minimal_stack_args = {.num_args = 1, |
||||||
|
.args = &minimal_stack_arg}; |
||||||
|
errors += CHECK_STACK("unknown", &minimal_stack_args, |
||||||
|
GRPC_CLIENT_DIRECT_CHANNEL, "connected", NULL); |
||||||
|
errors += CHECK_STACK("unknown", &minimal_stack_args, GRPC_CLIENT_SUBCHANNEL, |
||||||
|
"connected", NULL); |
||||||
|
errors += CHECK_STACK("unknown", &minimal_stack_args, GRPC_SERVER_CHANNEL, |
||||||
|
"server", "connected", NULL); |
||||||
|
errors += |
||||||
|
CHECK_STACK("chttp2", &minimal_stack_args, GRPC_CLIENT_DIRECT_CHANNEL, |
||||||
|
"http-client", "connected", NULL); |
||||||
|
errors += CHECK_STACK("chttp2", &minimal_stack_args, GRPC_CLIENT_SUBCHANNEL, |
||||||
|
"http-client", "connected", NULL); |
||||||
|
errors += CHECK_STACK("chttp2", &minimal_stack_args, GRPC_SERVER_CHANNEL, |
||||||
|
"server", "http-server", "connected", NULL); |
||||||
|
errors += CHECK_STACK(NULL, &minimal_stack_args, GRPC_CLIENT_CHANNEL, |
||||||
|
"client-channel", NULL); |
||||||
|
|
||||||
|
// tests with a default stack
|
||||||
|
errors += CHECK_STACK("unknown", NULL, GRPC_CLIENT_DIRECT_CHANNEL, |
||||||
|
"message_size", "deadline", "connected", NULL); |
||||||
|
errors += CHECK_STACK("unknown", NULL, GRPC_CLIENT_SUBCHANNEL, "message_size", |
||||||
|
"connected", NULL); |
||||||
|
errors += CHECK_STACK("unknown", NULL, GRPC_SERVER_CHANNEL, "server", |
||||||
|
"message_size", "deadline", "connected", NULL); |
||||||
|
errors += |
||||||
|
CHECK_STACK("chttp2", NULL, GRPC_CLIENT_DIRECT_CHANNEL, "message_size", |
||||||
|
"deadline", "http-client", "compress", "connected", NULL); |
||||||
|
errors += CHECK_STACK("chttp2", NULL, GRPC_CLIENT_SUBCHANNEL, "message_size", |
||||||
|
"http-client", "compress", "connected", NULL); |
||||||
|
errors += |
||||||
|
CHECK_STACK("chttp2", NULL, GRPC_SERVER_CHANNEL, "server", "message_size", |
||||||
|
"deadline", "http-server", "compress", "connected", NULL); |
||||||
|
errors += |
||||||
|
CHECK_STACK(NULL, NULL, GRPC_CLIENT_CHANNEL, "client-channel", NULL); |
||||||
|
|
||||||
|
GPR_ASSERT(errors == 0); |
||||||
|
grpc_shutdown(); |
||||||
|
return 0; |
||||||
|
} |
||||||
|
|
||||||
|
/*******************************************************************************
|
||||||
|
* End of tests definitions, start of test infrastructure |
||||||
|
*/ |
||||||
|
|
||||||
|
static int check_stack(const char *file, int line, const char *transport_name, |
||||||
|
grpc_channel_args *init_args, |
||||||
|
grpc_channel_stack_type channel_stack_type, ...) { |
||||||
|
// create dummy channel stack
|
||||||
|
grpc_channel_stack_builder *builder = grpc_channel_stack_builder_create(); |
||||||
|
grpc_transport_vtable fake_transport_vtable = {.name = transport_name}; |
||||||
|
grpc_transport fake_transport = {.vtable = &fake_transport_vtable}; |
||||||
|
grpc_channel_stack_builder_set_target(builder, "foo.test.google.fr"); |
||||||
|
grpc_channel_args *channel_args = grpc_channel_args_copy(init_args); |
||||||
|
if (transport_name != NULL) { |
||||||
|
grpc_channel_stack_builder_set_transport(builder, &fake_transport); |
||||||
|
} |
||||||
|
{ |
||||||
|
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; |
||||||
|
grpc_channel_stack_builder_set_channel_arguments(&exec_ctx, builder, |
||||||
|
channel_args); |
||||||
|
GPR_ASSERT( |
||||||
|
grpc_channel_init_create_stack(&exec_ctx, builder, channel_stack_type)); |
||||||
|
grpc_exec_ctx_finish(&exec_ctx); |
||||||
|
} |
||||||
|
|
||||||
|
// build up our expectation list
|
||||||
|
gpr_strvec v; |
||||||
|
gpr_strvec_init(&v); |
||||||
|
va_list args; |
||||||
|
va_start(args, channel_stack_type); |
||||||
|
for (;;) { |
||||||
|
char *a = va_arg(args, char *); |
||||||
|
if (a == NULL) break; |
||||||
|
if (v.count != 0) gpr_strvec_add(&v, gpr_strdup(", ")); |
||||||
|
gpr_strvec_add(&v, gpr_strdup(a)); |
||||||
|
} |
||||||
|
va_end(args); |
||||||
|
char *expect = gpr_strvec_flatten(&v, NULL); |
||||||
|
gpr_strvec_destroy(&v); |
||||||
|
|
||||||
|
// build up our "got" list
|
||||||
|
gpr_strvec_init(&v); |
||||||
|
grpc_channel_stack_builder_iterator *it = |
||||||
|
grpc_channel_stack_builder_create_iterator_at_first(builder); |
||||||
|
while (grpc_channel_stack_builder_move_next(it)) { |
||||||
|
const char *name = grpc_channel_stack_builder_iterator_filter_name(it); |
||||||
|
if (name == NULL) continue; |
||||||
|
if (v.count != 0) gpr_strvec_add(&v, gpr_strdup(", ")); |
||||||
|
gpr_strvec_add(&v, gpr_strdup(name)); |
||||||
|
} |
||||||
|
char *got = gpr_strvec_flatten(&v, NULL); |
||||||
|
gpr_strvec_destroy(&v); |
||||||
|
grpc_channel_stack_builder_iterator_destroy(it); |
||||||
|
|
||||||
|
// figure out result, log if there's an error
|
||||||
|
int result = 0; |
||||||
|
if (0 != strcmp(got, expect)) { |
||||||
|
gpr_strvec_init(&v); |
||||||
|
gpr_strvec_add(&v, gpr_strdup("{")); |
||||||
|
for (size_t i = 0; i < channel_args->num_args; i++) { |
||||||
|
if (i > 0) gpr_strvec_add(&v, gpr_strdup(", ")); |
||||||
|
gpr_strvec_add(&v, gpr_strdup(channel_args->args[i].key)); |
||||||
|
gpr_strvec_add(&v, gpr_strdup("=")); |
||||||
|
switch (channel_args->args[i].type) { |
||||||
|
case GRPC_ARG_INTEGER: { |
||||||
|
char *tmp; |
||||||
|
gpr_asprintf(&tmp, "%d", channel_args->args[i].value.integer); |
||||||
|
gpr_strvec_add(&v, tmp); |
||||||
|
break; |
||||||
|
} |
||||||
|
case GRPC_ARG_STRING: |
||||||
|
gpr_strvec_add(&v, gpr_strdup(channel_args->args[i].value.string)); |
||||||
|
break; |
||||||
|
case GRPC_ARG_POINTER: { |
||||||
|
char *tmp; |
||||||
|
gpr_asprintf(&tmp, "%p", channel_args->args[i].value.pointer.p); |
||||||
|
gpr_strvec_add(&v, tmp); |
||||||
|
break; |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
gpr_strvec_add(&v, gpr_strdup("}")); |
||||||
|
char *args_str = gpr_strvec_flatten(&v, NULL); |
||||||
|
gpr_strvec_destroy(&v); |
||||||
|
|
||||||
|
gpr_log(file, line, GPR_LOG_SEVERITY_ERROR, |
||||||
|
"**************************************************"); |
||||||
|
gpr_log(file, line, GPR_LOG_SEVERITY_ERROR, |
||||||
|
"FAILED transport=%s; stack_type=%s; channel_args=%s:", |
||||||
|
transport_name, grpc_channel_stack_type_string(channel_stack_type), |
||||||
|
args_str); |
||||||
|
gpr_log(file, line, GPR_LOG_SEVERITY_ERROR, "EXPECTED: %s", expect); |
||||||
|
gpr_log(file, line, GPR_LOG_SEVERITY_ERROR, "GOT: %s", got); |
||||||
|
result = 1; |
||||||
|
|
||||||
|
gpr_free(args_str); |
||||||
|
} |
||||||
|
|
||||||
|
gpr_free(got); |
||||||
|
gpr_free(expect); |
||||||
|
|
||||||
|
{ |
||||||
|
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; |
||||||
|
grpc_channel_stack_builder_destroy(&exec_ctx, builder); |
||||||
|
grpc_channel_args_destroy(&exec_ctx, channel_args); |
||||||
|
grpc_exec_ctx_finish(&exec_ctx); |
||||||
|
} |
||||||
|
|
||||||
|
return result; |
||||||
|
} |
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue