diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-24 08:20:03 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-24 08:20:03 -0700 |
| commit | d978a95d3cb9b2edf26efa2a9a5942192524209c (patch) | |
| tree | bef03d2c2fce5efafebf264e6f17d0c15a6b6f6e /src/core/lib/surface | |
| parent | 26f6c1b2390deab5f891003b448793a63bd09130 (diff) | |
| parent | 7e0e18d21e996c1bed242bca8eacb559527f95e3 (diff) | |
Merge github.com:grpc/grpc into hybrid
Diffstat (limited to 'src/core/lib/surface')
| -rw-r--r-- | src/core/lib/surface/call.c | 1 | ||||
| -rw-r--r-- | src/core/lib/surface/server.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c index 9aa457d792..7525806583 100644 --- a/src/core/lib/surface/call.c +++ b/src/core/lib/surface/call.c @@ -245,6 +245,7 @@ struct grpc_call { }; int grpc_call_error_trace = 0; +int grpc_compression_trace = 0; #define CALL_STACK_FROM_CALL(call) ((grpc_call_stack *)((call) + 1)) #define CALL_FROM_CALL_STACK(call_stack) (((grpc_call *)(call_stack)) - 1) diff --git a/src/core/lib/surface/server.c b/src/core/lib/surface/server.c index 9e4ab543e4..934ca0431a 100644 --- a/src/core/lib/surface/server.c +++ b/src/core/lib/surface/server.c @@ -1020,8 +1020,6 @@ grpc_server *grpc_server_create(const grpc_channel_args *args, void *reserved) { grpc_server *server = gpr_zalloc(sizeof(grpc_server)); - GPR_ASSERT(grpc_is_initialized() && "call grpc_init()"); - gpr_mu_init(&server->mu_global); gpr_mu_init(&server->mu_call); gpr_cv_init(&server->starting_cv); |