merge with head
This commit is contained in:
yang-g
commit
59cd467a74
6
BUILD
6
BUILD
|
|
@ -161,7 +161,6 @@ cc_library(
|
|||
"src/core/channel/context.h",
|
||||
"src/core/channel/http_client_filter.h",
|
||||
"src/core/channel/http_server_filter.h",
|
||||
"src/core/channel/noop_filter.h",
|
||||
"src/core/channel/subchannel_call_holder.h",
|
||||
"src/core/client_config/client_config.h",
|
||||
"src/core/client_config/connector.h",
|
||||
|
|
@ -299,7 +298,6 @@ cc_library(
|
|||
"src/core/channel/connected_channel.c",
|
||||
"src/core/channel/http_client_filter.c",
|
||||
"src/core/channel/http_server_filter.c",
|
||||
"src/core/channel/noop_filter.c",
|
||||
"src/core/channel/subchannel_call_holder.c",
|
||||
"src/core/client_config/client_config.c",
|
||||
"src/core/client_config/connector.c",
|
||||
|
|
@ -453,7 +451,6 @@ cc_library(
|
|||
"src/core/channel/context.h",
|
||||
"src/core/channel/http_client_filter.h",
|
||||
"src/core/channel/http_server_filter.h",
|
||||
"src/core/channel/noop_filter.h",
|
||||
"src/core/channel/subchannel_call_holder.h",
|
||||
"src/core/client_config/client_config.h",
|
||||
"src/core/client_config/connector.h",
|
||||
|
|
@ -571,7 +568,6 @@ cc_library(
|
|||
"src/core/channel/connected_channel.c",
|
||||
"src/core/channel/http_client_filter.c",
|
||||
"src/core/channel/http_server_filter.c",
|
||||
"src/core/channel/noop_filter.c",
|
||||
"src/core/channel/subchannel_call_holder.c",
|
||||
"src/core/client_config/client_config.c",
|
||||
"src/core/client_config/connector.c",
|
||||
|
|
@ -1105,7 +1101,6 @@ objc_library(
|
|||
"src/core/channel/connected_channel.c",
|
||||
"src/core/channel/http_client_filter.c",
|
||||
"src/core/channel/http_server_filter.c",
|
||||
"src/core/channel/noop_filter.c",
|
||||
"src/core/channel/subchannel_call_holder.c",
|
||||
"src/core/client_config/client_config.c",
|
||||
"src/core/client_config/connector.c",
|
||||
|
|
@ -1256,7 +1251,6 @@ objc_library(
|
|||
"src/core/channel/context.h",
|
||||
"src/core/channel/http_client_filter.h",
|
||||
"src/core/channel/http_server_filter.h",
|
||||
"src/core/channel/noop_filter.h",
|
||||
"src/core/channel/subchannel_call_holder.h",
|
||||
"src/core/client_config/client_config.h",
|
||||
"src/core/client_config/connector.h",
|
||||
|
|
|
|||
|
|
@ -183,7 +183,6 @@
|
|||
'src/core/channel/connected_channel.c',
|
||||
'src/core/channel/http_client_filter.c',
|
||||
'src/core/channel/http_server_filter.c',
|
||||
'src/core/channel/noop_filter.c',
|
||||
'src/core/channel/subchannel_call_holder.c',
|
||||
'src/core/client_config/client_config.c',
|
||||
'src/core/client_config/connector.c',
|
||||
|
|
|
|||
10
build.yaml
10
build.yaml
|
|
@ -116,7 +116,6 @@ filegroups:
|
|||
- src/core/channel/context.h
|
||||
- src/core/channel/http_client_filter.h
|
||||
- src/core/channel/http_server_filter.h
|
||||
- src/core/channel/noop_filter.h
|
||||
- src/core/channel/subchannel_call_holder.h
|
||||
- src/core/client_config/client_config.h
|
||||
- src/core/client_config/connector.h
|
||||
|
|
@ -231,7 +230,6 @@ filegroups:
|
|||
- src/core/channel/connected_channel.c
|
||||
- src/core/channel/http_client_filter.c
|
||||
- src/core/channel/http_server_filter.c
|
||||
- src/core/channel/noop_filter.c
|
||||
- src/core/channel/subchannel_call_holder.c
|
||||
- src/core/client_config/client_config.c
|
||||
- src/core/client_config/connector.c
|
||||
|
|
@ -811,6 +809,14 @@ libs:
|
|||
- winsock
|
||||
- global
|
||||
targets:
|
||||
- name: alloc_test
|
||||
build: test
|
||||
language: c
|
||||
src:
|
||||
- test/core/support/alloc_test.c
|
||||
deps:
|
||||
- gpr_test_util
|
||||
- gpr
|
||||
- name: alpn_test
|
||||
build: test
|
||||
language: c
|
||||
|
|
|
|||
|
|
@ -165,7 +165,6 @@ Pod::Spec.new do |s|
|
|||
'src/core/channel/context.h',
|
||||
'src/core/channel/http_client_filter.h',
|
||||
'src/core/channel/http_server_filter.h',
|
||||
'src/core/channel/noop_filter.h',
|
||||
'src/core/channel/subchannel_call_holder.h',
|
||||
'src/core/client_config/client_config.h',
|
||||
'src/core/client_config/connector.h',
|
||||
|
|
@ -310,7 +309,6 @@ Pod::Spec.new do |s|
|
|||
'src/core/channel/connected_channel.c',
|
||||
'src/core/channel/http_client_filter.c',
|
||||
'src/core/channel/http_server_filter.c',
|
||||
'src/core/channel/noop_filter.c',
|
||||
'src/core/channel/subchannel_call_holder.c',
|
||||
'src/core/client_config/client_config.c',
|
||||
'src/core/client_config/connector.c',
|
||||
|
|
@ -463,7 +461,6 @@ Pod::Spec.new do |s|
|
|||
'src/core/channel/context.h',
|
||||
'src/core/channel/http_client_filter.h',
|
||||
'src/core/channel/http_server_filter.h',
|
||||
'src/core/channel/noop_filter.h',
|
||||
'src/core/channel/subchannel_call_holder.h',
|
||||
'src/core/client_config/client_config.h',
|
||||
'src/core/client_config/connector.h',
|
||||
|
|
|
|||
|
|
@ -40,6 +40,12 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct gpr_allocation_functions {
|
||||
void *(*malloc_fn)(size_t size);
|
||||
void *(*realloc_fn)(void *ptr, size_t size);
|
||||
void (*free_fn)(void *ptr);
|
||||
} gpr_allocation_functions;
|
||||
|
||||
/* malloc, never returns NULL */
|
||||
void *gpr_malloc(size_t size);
|
||||
/* free */
|
||||
|
|
@ -51,6 +57,14 @@ void *gpr_malloc_aligned(size_t size, size_t alignment_log);
|
|||
/* free memory allocated by gpr_malloc_aligned */
|
||||
void gpr_free_aligned(void *ptr);
|
||||
|
||||
/** Request the family of allocation functions in \a functions be used. NOTE
|
||||
* that this request will be honored in a *best effort* basis and that no
|
||||
* guarantees are made about the default functions (eg, malloc) being called. */
|
||||
void gpr_set_allocation_functions(gpr_allocation_functions functions);
|
||||
|
||||
/** Return the family of allocation functions currently in effect. */
|
||||
gpr_allocation_functions gpr_get_allocation_functions();
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
#include <grpc/support/time.h>
|
||||
|
||||
#include "src/core/channel/channel_stack.h"
|
||||
#include "src/core/channel/noop_filter.h"
|
||||
#include "src/core/statistics/census_interface.h"
|
||||
#include "src/core/statistics/census_rpc_stats.h"
|
||||
#include "src/core/transport/static_metadata.h"
|
||||
|
|
|
|||
|
|
@ -1,118 +0,0 @@
|
|||
/*
|
||||
*
|
||||
* Copyright 2015, 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 "src/core/channel/noop_filter.h"
|
||||
#include <grpc/support/log.h>
|
||||
|
||||
typedef struct call_data {
|
||||
int unused; /* C89 requires at least one struct element */
|
||||
} call_data;
|
||||
|
||||
typedef struct channel_data {
|
||||
int unused; /* C89 requires at least one struct element */
|
||||
} channel_data;
|
||||
|
||||
/* used to silence 'variable not used' warnings */
|
||||
static void ignore_unused(void *ignored) {}
|
||||
|
||||
static void noop_mutate_op(grpc_call_element *elem,
|
||||
grpc_transport_stream_op *op) {
|
||||
/* grab pointers to our data from the call element */
|
||||
call_data *calld = elem->call_data;
|
||||
channel_data *channeld = elem->channel_data;
|
||||
|
||||
ignore_unused(calld);
|
||||
ignore_unused(channeld);
|
||||
|
||||
/* do nothing */
|
||||
}
|
||||
|
||||
/* Called either:
|
||||
- in response to an API call (or similar) from above, to send something
|
||||
- a network event (or similar) from below, to receive something
|
||||
op contains type and call direction information, in addition to the data
|
||||
that is being sent or received. */
|
||||
static void noop_start_transport_stream_op(grpc_exec_ctx *exec_ctx,
|
||||
grpc_call_element *elem,
|
||||
grpc_transport_stream_op *op) {
|
||||
noop_mutate_op(elem, op);
|
||||
|
||||
/* pass control down the stack */
|
||||
grpc_call_next_op(exec_ctx, elem, op);
|
||||
}
|
||||
|
||||
/* Constructor for call_data */
|
||||
static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
|
||||
grpc_call_element_args *args) {
|
||||
/* grab pointers to our data from the call element */
|
||||
call_data *calld = elem->call_data;
|
||||
channel_data *channeld = elem->channel_data;
|
||||
|
||||
/* initialize members */
|
||||
calld->unused = channeld->unused;
|
||||
}
|
||||
|
||||
/* Destructor for call_data */
|
||||
static void destroy_call_elem(grpc_exec_ctx *exec_ctx,
|
||||
grpc_call_element *elem) {}
|
||||
|
||||
/* Constructor for channel_data */
|
||||
static void init_channel_elem(grpc_exec_ctx *exec_ctx,
|
||||
grpc_channel_element *elem,
|
||||
grpc_channel_element_args *args) {
|
||||
/* grab pointers to our data from the channel element */
|
||||
channel_data *channeld = elem->channel_data;
|
||||
|
||||
/* The last filter tends to be implemented differently to
|
||||
handle the case that there's no 'next' filter to call on the down
|
||||
path */
|
||||
GPR_ASSERT(!args->is_last);
|
||||
|
||||
/* initialize members */
|
||||
channeld->unused = 0;
|
||||
}
|
||||
|
||||
/* Destructor for channel data */
|
||||
static void destroy_channel_elem(grpc_exec_ctx *exec_ctx,
|
||||
grpc_channel_element *elem) {
|
||||
/* grab pointers to our data from the channel element */
|
||||
channel_data *channeld = elem->channel_data;
|
||||
|
||||
ignore_unused(channeld);
|
||||
}
|
||||
|
||||
const grpc_channel_filter grpc_no_op_filter = {
|
||||
noop_start_transport_stream_op, grpc_channel_next_op, sizeof(call_data),
|
||||
init_call_elem, grpc_call_stack_ignore_set_pollset, destroy_call_elem,
|
||||
sizeof(channel_data), init_channel_elem, destroy_channel_elem,
|
||||
grpc_call_next_get_peer, "no-op"};
|
||||
|
|
@ -91,6 +91,14 @@ error:
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void *zalloc_gpr(void* opaque, unsigned int items, unsigned int size) {
|
||||
return gpr_malloc(items * size);
|
||||
}
|
||||
|
||||
static void zfree_gpr(void* opaque, void *address) {
|
||||
gpr_free(address);
|
||||
}
|
||||
|
||||
static int zlib_compress(gpr_slice_buffer* input, gpr_slice_buffer* output,
|
||||
int gzip) {
|
||||
z_stream zs;
|
||||
|
|
@ -99,6 +107,8 @@ static int zlib_compress(gpr_slice_buffer* input, gpr_slice_buffer* output,
|
|||
size_t count_before = output->count;
|
||||
size_t length_before = output->length;
|
||||
memset(&zs, 0, sizeof(zs));
|
||||
zs.zalloc = zalloc_gpr;
|
||||
zs.zfree = zfree_gpr;
|
||||
r = deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 | (gzip ? 16 : 0),
|
||||
8, Z_DEFAULT_STRATEGY);
|
||||
if (r != Z_OK) {
|
||||
|
|
@ -125,6 +135,8 @@ static int zlib_decompress(gpr_slice_buffer* input, gpr_slice_buffer* output,
|
|||
size_t count_before = output->count;
|
||||
size_t length_before = output->length;
|
||||
memset(&zs, 0, sizeof(zs));
|
||||
zs.zalloc = zalloc_gpr;
|
||||
zs.zfree = zfree_gpr;
|
||||
r = inflateInit2(&zs, 15 | (gzip ? 16 : 0));
|
||||
if (r != Z_OK) {
|
||||
gpr_log(GPR_ERROR, "inflateInit2 returns %d", r);
|
||||
|
|
@ -150,7 +162,7 @@ static int copy(gpr_slice_buffer* input, gpr_slice_buffer* output) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
int compress_inner(grpc_compression_algorithm algorithm,
|
||||
static int compress_inner(grpc_compression_algorithm algorithm,
|
||||
gpr_slice_buffer* input, gpr_slice_buffer* output) {
|
||||
switch (algorithm) {
|
||||
case GRPC_COMPRESS_NONE:
|
||||
|
|
|
|||
|
|
@ -34,13 +34,27 @@
|
|||
#include <grpc/support/alloc.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <grpc/support/log.h>
|
||||
#include <grpc/support/port_platform.h>
|
||||
#include "src/core/profiling/timers.h"
|
||||
|
||||
static gpr_allocation_functions g_alloc_functions = {malloc, realloc, free};
|
||||
|
||||
gpr_allocation_functions gpr_get_allocation_functions() {
|
||||
return g_alloc_functions;
|
||||
}
|
||||
|
||||
void gpr_set_allocation_functions(gpr_allocation_functions functions) {
|
||||
GPR_ASSERT(functions.malloc_fn != NULL);
|
||||
GPR_ASSERT(functions.realloc_fn != NULL);
|
||||
GPR_ASSERT(functions.free_fn != NULL);
|
||||
g_alloc_functions = functions;
|
||||
}
|
||||
|
||||
void *gpr_malloc(size_t size) {
|
||||
void *p;
|
||||
GPR_TIMER_BEGIN("gpr_malloc", 0);
|
||||
p = malloc(size);
|
||||
p = g_alloc_functions.malloc_fn(size);
|
||||
if (!p) {
|
||||
abort();
|
||||
}
|
||||
|
|
@ -50,13 +64,13 @@ void *gpr_malloc(size_t size) {
|
|||
|
||||
void gpr_free(void *p) {
|
||||
GPR_TIMER_BEGIN("gpr_free", 0);
|
||||
free(p);
|
||||
g_alloc_functions.free_fn(p);
|
||||
GPR_TIMER_END("gpr_free", 0);
|
||||
}
|
||||
|
||||
void *gpr_realloc(void *p, size_t size) {
|
||||
GPR_TIMER_BEGIN("gpr_realloc", 0);
|
||||
p = realloc(p, size);
|
||||
p = g_alloc_functions.realloc_fn(p, size);
|
||||
if (!p) {
|
||||
abort();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,8 @@
|
|||
#include "src/core/transport/chttp2/http2_errors.h"
|
||||
#include "src/core/transport/chttp2_transport.h"
|
||||
|
||||
#define MAX_MAX_HEADER_LIST_SIZE (1024*1024*1024)
|
||||
|
||||
/* HTTP/2 mandated initial connection settings */
|
||||
const grpc_chttp2_setting_parameters
|
||||
grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS] = {
|
||||
|
|
@ -60,7 +62,7 @@ const grpc_chttp2_setting_parameters
|
|||
GRPC_CHTTP2_FLOW_CONTROL_ERROR},
|
||||
{"MAX_FRAME_SIZE", 16384, 16384, 16777215,
|
||||
GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE, GRPC_CHTTP2_PROTOCOL_ERROR},
|
||||
{"MAX_HEADER_LIST_SIZE", 0xffffffffu, 0, 0xffffffffu,
|
||||
{"MAX_HEADER_LIST_SIZE", MAX_MAX_HEADER_LIST_SIZE, 0, MAX_MAX_HEADER_LIST_SIZE,
|
||||
GRPC_CHTTP2_CLAMP_INVALID_VALUE, GRPC_CHTTP2_PROTOCOL_ERROR},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,15 @@ int main(int argc, char **argv) {
|
|||
/* some settings values are illegal */
|
||||
/* max frame size = 0 */
|
||||
GRPC_RUN_BAD_CLIENT_TEST(verifier,
|
||||
PFX_STR ONE_SETTING_HDR "\x00\x05\x00\x00\x00\x00", GRPC_BAD_CLIENT_DISCONNECT);
|
||||
PFX_STR ONE_SETTING_HDR "\x00\x05\x00\x00\x00\x00",
|
||||
GRPC_BAD_CLIENT_DISCONNECT);
|
||||
GRPC_RUN_BAD_CLIENT_TEST(verifier,
|
||||
PFX_STR ONE_SETTING_HDR "\x00\x06\xff\xff\xff\xff",
|
||||
GRPC_BAD_CLIENT_DISCONNECT);
|
||||
/* update intiial window size */
|
||||
GRPC_RUN_BAD_CLIENT_TEST(verifier,
|
||||
PFX_STR ONE_SETTING_HDR "\x00\x04\x00\x01\x00\x00",
|
||||
GRPC_BAD_CLIENT_DISCONNECT);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -168,6 +168,49 @@ static void test_bad_data(void) {
|
|||
gpr_slice_buffer_destroy(&output);
|
||||
}
|
||||
|
||||
static void test_bad_compression_algorithm(void) {
|
||||
gpr_slice_buffer input;
|
||||
gpr_slice_buffer output;
|
||||
int was_compressed;
|
||||
|
||||
gpr_slice_buffer_init(&input);
|
||||
gpr_slice_buffer_init(&output);
|
||||
gpr_slice_buffer_add(&input, gpr_slice_from_copied_string(
|
||||
"Never gonna give you up"));
|
||||
was_compressed =
|
||||
grpc_msg_compress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output);
|
||||
GPR_ASSERT(0 == was_compressed);
|
||||
|
||||
was_compressed =
|
||||
grpc_msg_compress(GRPC_COMPRESS_ALGORITHMS_COUNT + 123, &input, &output);
|
||||
GPR_ASSERT(0 == was_compressed);
|
||||
|
||||
gpr_slice_buffer_destroy(&input);
|
||||
gpr_slice_buffer_destroy(&output);
|
||||
}
|
||||
|
||||
static void test_bad_decompression_algorithm(void) {
|
||||
gpr_slice_buffer input;
|
||||
gpr_slice_buffer output;
|
||||
int was_decompressed;
|
||||
|
||||
gpr_slice_buffer_init(&input);
|
||||
gpr_slice_buffer_init(&output);
|
||||
gpr_slice_buffer_add(&input,
|
||||
gpr_slice_from_copied_string(
|
||||
"I'm not really compressed but it doesn't matter"));
|
||||
was_decompressed =
|
||||
grpc_msg_decompress(GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output);
|
||||
GPR_ASSERT(0 == was_decompressed);
|
||||
|
||||
was_decompressed =
|
||||
grpc_msg_decompress(GRPC_COMPRESS_ALGORITHMS_COUNT + 123, &input, &output);
|
||||
GPR_ASSERT(0 == was_decompressed);
|
||||
|
||||
gpr_slice_buffer_destroy(&input);
|
||||
gpr_slice_buffer_destroy(&output);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
unsigned i, j, k, m;
|
||||
grpc_slice_split_mode uncompressed_split_modes[] = {
|
||||
|
|
@ -192,6 +235,8 @@ int main(int argc, char **argv) {
|
|||
}
|
||||
|
||||
test_bad_data();
|
||||
test_bad_compression_algorithm();
|
||||
test_bad_decompression_algorithm();
|
||||
grpc_shutdown();
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -31,14 +31,44 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef GRPC_INTERNAL_CORE_CHANNEL_NOOP_FILTER_H
|
||||
#define GRPC_INTERNAL_CORE_CHANNEL_NOOP_FILTER_H
|
||||
#include <grpc/support/log.h>
|
||||
#include <grpc/support/alloc.h>
|
||||
#include "test/core/util/test_config.h"
|
||||
|
||||
#include "src/core/channel/channel_stack.h"
|
||||
static void *fake_malloc(size_t size) {
|
||||
return (void*)size;
|
||||
}
|
||||
|
||||
/* No-op filter: simply takes everything it's given, and passes it on to the
|
||||
next filter. Exists simply as a starting point that others can take and
|
||||
customize for their own filters */
|
||||
extern const grpc_channel_filter grpc_no_op_filter;
|
||||
static void *fake_realloc(void *addr, size_t size) {
|
||||
return (void*)size;
|
||||
}
|
||||
|
||||
#endif /* GRPC_INTERNAL_CORE_CHANNEL_NOOP_FILTER_H */
|
||||
static void fake_free(void *addr) {
|
||||
*((gpr_intptr*)addr) = 0xdeadd00d;
|
||||
}
|
||||
|
||||
static void test_custom_allocs() {
|
||||
const gpr_allocation_functions default_fns = gpr_get_allocation_functions();
|
||||
gpr_intptr addr_to_free = 0;
|
||||
int *i;
|
||||
gpr_allocation_functions fns = {fake_malloc, fake_realloc, fake_free};
|
||||
|
||||
gpr_set_allocation_functions(fns);
|
||||
GPR_ASSERT((void*)0xdeadbeef == gpr_malloc(0xdeadbeef));
|
||||
GPR_ASSERT((void*)0xcafed00d == gpr_realloc(0, 0xcafed00d));
|
||||
|
||||
gpr_free(&addr_to_free);
|
||||
GPR_ASSERT(addr_to_free == 0xdeadd00d);
|
||||
|
||||
/* Restore and check we don't get funky values and that we don't leak */
|
||||
gpr_set_allocation_functions(default_fns);
|
||||
GPR_ASSERT((void*)1 != (i = gpr_malloc(sizeof(*i))));
|
||||
GPR_ASSERT((void*)2 != (i = gpr_realloc(i, 2)));
|
||||
gpr_free(i);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
grpc_test_init(argc, argv);
|
||||
test_custom_allocs();
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -241,6 +241,25 @@ static void test_base64_and_huffman_works(void) {
|
|||
grpc_shutdown();
|
||||
}
|
||||
|
||||
static void test_user_data_works(void) {
|
||||
int *ud1;
|
||||
int *ud2;
|
||||
grpc_mdelem *md;
|
||||
LOG_TEST("test_user_data_works");
|
||||
|
||||
grpc_init();
|
||||
ud1 = gpr_malloc(sizeof(int));
|
||||
*ud1 = 1;
|
||||
ud2 = gpr_malloc(sizeof(int));
|
||||
*ud2 = 2;
|
||||
md = grpc_mdelem_from_strings("abc", "123");
|
||||
grpc_mdelem_set_user_data(md, gpr_free, ud1);
|
||||
grpc_mdelem_set_user_data(md, gpr_free, ud2);
|
||||
GPR_ASSERT(grpc_mdelem_get_user_data(md, gpr_free) == ud1);
|
||||
GRPC_MDELEM_UNREF(md);
|
||||
grpc_shutdown();
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
grpc_test_init(argc, argv);
|
||||
test_no_op();
|
||||
|
|
@ -252,5 +271,6 @@ int main(int argc, char **argv) {
|
|||
test_things_stick_around();
|
||||
test_slices_work();
|
||||
test_base64_and_huffman_works();
|
||||
test_user_data_works();
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -179,6 +179,17 @@ class AsyncEnd2endTest : public ::testing::TestWithParam<bool> {
|
|||
void SetUp() GRPC_OVERRIDE {
|
||||
int port = grpc_pick_unused_port_or_die();
|
||||
server_address_ << "localhost:" << port;
|
||||
|
||||
// It is currently unsupported to mix sync and async services
|
||||
// in the same server, so first test that (for coverage)
|
||||
ServerBuilder build_bad;
|
||||
build_bad.AddListeningPort(server_address_.str(),
|
||||
grpc::InsecureServerCredentials());
|
||||
build_bad.RegisterAsyncService(&service_);
|
||||
grpc::cpp::test::util::TestService::Service sync_service;
|
||||
build_bad.RegisterService(&sync_service);
|
||||
GPR_ASSERT(build_bad.BuildAndStart() == nullptr);
|
||||
|
||||
// Setup server
|
||||
ServerBuilder builder;
|
||||
builder.AddListeningPort(server_address_.str(),
|
||||
|
|
|
|||
|
|
@ -790,7 +790,6 @@ src/core/channel/connected_channel.h \
|
|||
src/core/channel/context.h \
|
||||
src/core/channel/http_client_filter.h \
|
||||
src/core/channel/http_server_filter.h \
|
||||
src/core/channel/noop_filter.h \
|
||||
src/core/channel/subchannel_call_holder.h \
|
||||
src/core/client_config/client_config.h \
|
||||
src/core/client_config/connector.h \
|
||||
|
|
@ -928,7 +927,6 @@ src/core/channel/compress_filter.c \
|
|||
src/core/channel/connected_channel.c \
|
||||
src/core/channel/http_client_filter.c \
|
||||
src/core/channel/http_server_filter.c \
|
||||
src/core/channel/noop_filter.c \
|
||||
src/core/channel/subchannel_call_holder.c \
|
||||
src/core/client_config/client_config.c \
|
||||
src/core/client_config/connector.c \
|
||||
|
|
|
|||
|
|
@ -100,5 +100,19 @@ RUN /bin/bash -l -c "rvm all do gem install ronn rake"
|
|||
RUN curl -sS https://getcomposer.org/installer | php
|
||||
RUN mv composer.phar /usr/local/bin/composer
|
||||
|
||||
# Download the patched PHP protobuf so that PHP gRPC clients can be generated
|
||||
# from proto3 schemas.
|
||||
RUN git clone https://github.com/stanley-cheung/Protobuf-PHP.git /var/local/git/protobuf-php
|
||||
|
||||
RUN /bin/bash -l -c "rvm use ruby-2.1 \
|
||||
&& cd /var/local/git/protobuf-php \
|
||||
&& rvm all do rake pear:package version=1.0 \
|
||||
&& pear install Protobuf-1.0.tgz"
|
||||
|
||||
# As an attempt to work around #4212, try to prefetch Protobuf-PHP dependency
|
||||
# into composer cache to prevent "composer install" from cloning on each build.
|
||||
RUN git clone --mirror https://github.com/stanley-cheung/Protobuf-PHP.git \
|
||||
/root/.composer/cache/vcs/git-github.com-stanley-cheung-Protobuf-PHP.git/
|
||||
|
||||
# Define the default command.
|
||||
CMD ["bash"]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
# Builds PHP interop server and client in a base image.
|
||||
set -e
|
||||
set -ex
|
||||
|
||||
mkdir -p /var/local/git
|
||||
git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
|
||||
|
|
@ -45,18 +45,10 @@ make install-certs
|
|||
# gRPC core and protobuf need to be installed
|
||||
make install
|
||||
|
||||
# Download the patched PHP protobuf so that PHP gRPC clients can be generated
|
||||
# from proto3 schemas.
|
||||
git clone https://github.com/stanley-cheung/Protobuf-PHP.git /var/local/git/protobuf-php
|
||||
|
||||
(cd src/php/ext/grpc && phpize && ./configure && make)
|
||||
|
||||
(cd third_party/protobuf && make install)
|
||||
|
||||
(cd /var/local/git/protobuf-php \
|
||||
&& rvm all do rake pear:package version=1.0 \
|
||||
&& pear install Protobuf-1.0.tgz)
|
||||
|
||||
(cd src/php && composer install)
|
||||
|
||||
(cd src/php && protoc-gen-php -i tests/interop/ -o tests/interop/ tests/interop/test.proto)
|
||||
|
|
|
|||
|
|
@ -78,8 +78,7 @@ def render_interop_html_report(
|
|||
client_langs, server_langs, test_cases, auth_test_cases, http2_cases,
|
||||
resultset, num_failures, cloud_to_prod, http2_interop):
|
||||
"""Generate HTML report for interop tests."""
|
||||
html_report_dir = 'reports'
|
||||
template_file = os.path.join(html_report_dir, 'interop_html_report.template')
|
||||
template_file = 'tools/run_tests/interop_html_report.template'
|
||||
try:
|
||||
mytemplate = Template(filename=template_file, format_exceptions=True)
|
||||
except NameError:
|
||||
|
|
@ -104,6 +103,9 @@ def render_interop_html_report(
|
|||
'num_failures': num_failures,
|
||||
'cloud_to_prod': cloud_to_prod,
|
||||
'http2_interop': http2_interop}
|
||||
html_file_path = os.path.join(html_report_dir, 'index.html')
|
||||
html_report_out_dir = 'reports'
|
||||
if not os.path.exists(html_report_out_dir):
|
||||
os.mkdir(html_report_out_dir)
|
||||
html_file_path = os.path.join(html_report_out_dir, 'index.html')
|
||||
with open(html_file_path, 'w') as output_file:
|
||||
mytemplate.render_context(Context(output_file, **args))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,18 @@
|
|||
|
||||
|
||||
[
|
||||
{
|
||||
"deps": [
|
||||
"gpr",
|
||||
"gpr_test_util"
|
||||
],
|
||||
"headers": [],
|
||||
"language": "c",
|
||||
"name": "alloc_test",
|
||||
"src": [
|
||||
"test/core/support/alloc_test.c"
|
||||
]
|
||||
},
|
||||
{
|
||||
"deps": [
|
||||
"gpr",
|
||||
|
|
@ -14475,7 +14487,6 @@
|
|||
"src/core/channel/context.h",
|
||||
"src/core/channel/http_client_filter.h",
|
||||
"src/core/channel/http_server_filter.h",
|
||||
"src/core/channel/noop_filter.h",
|
||||
"src/core/channel/subchannel_call_holder.h",
|
||||
"src/core/client_config/client_config.h",
|
||||
"src/core/client_config/connector.h",
|
||||
|
|
@ -14630,8 +14641,6 @@
|
|||
"src/core/channel/http_client_filter.h",
|
||||
"src/core/channel/http_server_filter.c",
|
||||
"src/core/channel/http_server_filter.h",
|
||||
"src/core/channel/noop_filter.c",
|
||||
"src/core/channel/noop_filter.h",
|
||||
"src/core/channel/subchannel_call_holder.c",
|
||||
"src/core/channel/subchannel_call_holder.h",
|
||||
"src/core/client_config/client_config.c",
|
||||
|
|
@ -14987,7 +14996,6 @@
|
|||
"src/core/channel/context.h",
|
||||
"src/core/channel/http_client_filter.h",
|
||||
"src/core/channel/http_server_filter.h",
|
||||
"src/core/channel/noop_filter.h",
|
||||
"src/core/channel/subchannel_call_holder.h",
|
||||
"src/core/client_config/client_config.h",
|
||||
"src/core/client_config/connector.h",
|
||||
|
|
@ -15128,8 +15136,6 @@
|
|||
"src/core/channel/http_client_filter.h",
|
||||
"src/core/channel/http_server_filter.c",
|
||||
"src/core/channel/http_server_filter.h",
|
||||
"src/core/channel/noop_filter.c",
|
||||
"src/core/channel/noop_filter.h",
|
||||
"src/core/channel/subchannel_call_holder.c",
|
||||
"src/core/channel/subchannel_call_holder.h",
|
||||
"src/core/client_config/client_config.c",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,24 @@
|
|||
|
||||
|
||||
[
|
||||
{
|
||||
"ci_platforms": [
|
||||
"linux",
|
||||
"mac",
|
||||
"posix",
|
||||
"windows"
|
||||
],
|
||||
"exclude_configs": [],
|
||||
"flaky": false,
|
||||
"language": "c",
|
||||
"name": "alloc_test",
|
||||
"platforms": [
|
||||
"linux",
|
||||
"mac",
|
||||
"posix",
|
||||
"windows"
|
||||
]
|
||||
},
|
||||
{
|
||||
"ci_platforms": [
|
||||
"linux",
|
||||
|
|
|
|||
|
|
@ -1135,6 +1135,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bad_client_test", "vcxproj\
|
|||
{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alloc_test", "vcxproj\test\alloc_test\alloc_test.vcxproj", "{DD37D527-9DFF-1F53-B97F-50CF80AE0650}"
|
||||
ProjectSection(myProperties) = preProject
|
||||
lib = "False"
|
||||
EndProjectSection
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037}
|
||||
{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alpn_test", "vcxproj\test\alpn_test\alpn_test.vcxproj", "{5BAAE7EA-A972-DD80-F190-29B9E3110BB3}"
|
||||
ProjectSection(myProperties) = preProject
|
||||
lib = "False"
|
||||
|
|
@ -11732,6 +11741,22 @@ Global
|
|||
{BA67B418-B699-E41A-9CC4-0279C49481A5}.Release-DLL|Win32.Build.0 = Release|Win32
|
||||
{BA67B418-B699-E41A-9CC4-0279C49481A5}.Release-DLL|x64.ActiveCfg = Release|x64
|
||||
{BA67B418-B699-E41A-9CC4-0279C49481A5}.Release-DLL|x64.Build.0 = Release|x64
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Release|x64.ActiveCfg = Release|x64
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Debug|x64.Build.0 = Debug|x64
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Release|Win32.Build.0 = Release|Win32
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Release|x64.Build.0 = Release|x64
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Debug-DLL|Win32.ActiveCfg = Debug|Win32
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Debug-DLL|Win32.Build.0 = Debug|Win32
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Debug-DLL|x64.ActiveCfg = Debug|x64
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Debug-DLL|x64.Build.0 = Debug|x64
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Release-DLL|Win32.ActiveCfg = Release|Win32
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Release-DLL|Win32.Build.0 = Release|Win32
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Release-DLL|x64.ActiveCfg = Release|x64
|
||||
{DD37D527-9DFF-1F53-B97F-50CF80AE0650}.Release-DLL|x64.Build.0 = Release|x64
|
||||
{5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{5BAAE7EA-A972-DD80-F190-29B9E3110BB3}.Release|Win32.ActiveCfg = Release|Win32
|
||||
|
|
|
|||
|
|
@ -276,7 +276,6 @@
|
|||
<ClInclude Include="..\..\..\src\core\channel\context.h" />
|
||||
<ClInclude Include="..\..\..\src\core\channel\http_client_filter.h" />
|
||||
<ClInclude Include="..\..\..\src\core\channel\http_server_filter.h" />
|
||||
<ClInclude Include="..\..\..\src\core\channel\noop_filter.h" />
|
||||
<ClInclude Include="..\..\..\src\core\channel\subchannel_call_holder.h" />
|
||||
<ClInclude Include="..\..\..\src\core\client_config\client_config.h" />
|
||||
<ClInclude Include="..\..\..\src\core\client_config\connector.h" />
|
||||
|
|
@ -447,8 +446,6 @@
|
|||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\channel\http_server_filter.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\channel\noop_filter.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\channel\subchannel_call_holder.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\client_config\client_config.c">
|
||||
|
|
|
|||
|
|
@ -94,9 +94,6 @@
|
|||
<ClCompile Include="..\..\..\src\core\channel\http_server_filter.c">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\channel\noop_filter.c">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\channel\subchannel_call_holder.c">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -545,9 +542,6 @@
|
|||
<ClInclude Include="..\..\..\src\core\channel\http_server_filter.h">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\src\core\channel\noop_filter.h">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\src\core\channel\subchannel_call_holder.h">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -255,7 +255,6 @@
|
|||
<ClInclude Include="..\..\..\src\core\channel\context.h" />
|
||||
<ClInclude Include="..\..\..\src\core\channel\http_client_filter.h" />
|
||||
<ClInclude Include="..\..\..\src\core\channel\http_server_filter.h" />
|
||||
<ClInclude Include="..\..\..\src\core\channel\noop_filter.h" />
|
||||
<ClInclude Include="..\..\..\src\core\channel\subchannel_call_holder.h" />
|
||||
<ClInclude Include="..\..\..\src\core\client_config\client_config.h" />
|
||||
<ClInclude Include="..\..\..\src\core\client_config\connector.h" />
|
||||
|
|
@ -386,8 +385,6 @@
|
|||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\channel\http_server_filter.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\channel\noop_filter.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\channel\subchannel_call_holder.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\client_config\client_config.c">
|
||||
|
|
|
|||
|
|
@ -34,9 +34,6 @@
|
|||
<ClCompile Include="..\..\..\src\core\channel\http_server_filter.c">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\channel\noop_filter.c">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\src\core\channel\subchannel_call_holder.c">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -443,9 +440,6 @@
|
|||
<ClInclude Include="..\..\..\src\core\channel\http_server_filter.h">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\src\core\channel\noop_filter.h">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\src\core\channel\subchannel_call_holder.h">
|
||||
<Filter>src\core\channel</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,178 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\1.0.204.1.props')" />
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{DD37D527-9DFF-1F53-B97F-50CF80AE0650}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'" Label="Configuration">
|
||||
<PlatformToolset>v100</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(VisualStudioVersion)' == '11.0'" Label="Configuration">
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(VisualStudioVersion)' == '12.0'" Label="Configuration">
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\..\..\..\vsprojects\global.props" />
|
||||
<Import Project="..\..\..\..\vsprojects\openssl.props" />
|
||||
<Import Project="..\..\..\..\vsprojects\winsock.props" />
|
||||
<Import Project="..\..\..\..\vsprojects\zlib.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
|
||||
<TargetName>alloc_test</TargetName>
|
||||
<Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
|
||||
<Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib>
|
||||
<Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)'=='Release'">
|
||||
<TargetName>alloc_test</TargetName>
|
||||
<Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
|
||||
<Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib>
|
||||
<Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation>
|
||||
<GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation>
|
||||
<GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation>
|
||||
<GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<DebugInformationFormat Condition="$(Jenkins)">None</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation>
|
||||
<GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\..\test\core\support\alloc_test.c">
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\gpr_test_util\gpr_test_util.vcxproj">
|
||||
<Project>{EAB0A629-17A9-44DB-B5FF-E91A721FE037}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj">
|
||||
<Project>{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" />
|
||||
<Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies\grpc.dependencies.zlib.targets')" />
|
||||
<Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" />
|
||||
<Import Project="..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets" Condition="Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies\grpc.dependencies.openssl.targets')" />
|
||||
</ImportGroup>
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.redist.1.2.8.10\build\native\grpc.dependencies.zlib.redist.targets')" />
|
||||
<Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.zlib.1.2.8.10\build\native\grpc.dependencies.zlib.targets')" />
|
||||
<Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.redist.1.0.204.1\build\native\grpc.dependencies.openssl.redist.targets')" />
|
||||
<Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.props')" />
|
||||
<Error Condition="!Exists('..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\vsprojects\packages\grpc.dependencies.openssl.1.0.204.1\build\native\grpc.dependencies.openssl.targets')" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\..\test\core\support\alloc_test.c">
|
||||
<Filter>test\core\support</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Filter Include="test">
|
||||
<UniqueIdentifier>{8db8ec05-f062-e4a6-60a0-efa7208d4f9b}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="test\core">
|
||||
<UniqueIdentifier>{5d06003c-e2cd-4d48-87b3-dcb700cbb4e4}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="test\core\support">
|
||||
<UniqueIdentifier>{11853b15-8afe-b102-ee0d-6742942e3f6e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
Loading…
Reference in New Issue