diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-07-11 22:20:42 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-07-11 22:20:42 -0700 |
| commit | b395c9e2789de6a54bd8d24ad3a1fd3c6659c12f (patch) | |
| tree | bf9f945546243accfaf5e1774332d317e15b5224 /src/core/lib/surface | |
| parent | 01c4d995d35958c64e65feb8193c5ce2e0845758 (diff) | |
| parent | ef6b991d63f6c170a1886d66a27f8387ef7818e6 (diff) | |
Merge remote-tracking branch 'origin/fix_tsan' into lr_july_16
Diffstat (limited to 'src/core/lib/surface')
| -rw-r--r-- | src/core/lib/surface/call.c | 3 | ||||
| -rw-r--r-- | src/core/lib/surface/channel.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c index 6d218112ab..dc54978ccd 100644 --- a/src/core/lib/surface/call.c +++ b/src/core/lib/surface/call.c @@ -260,7 +260,8 @@ grpc_call *grpc_call_create( call->metadata_batch[i][j].deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); } } - call->send_deadline = send_deadline; + call->send_deadline = + gpr_convert_clock_type(send_deadline, GPR_CLOCK_MONOTONIC); GRPC_CHANNEL_INTERNAL_REF(channel, "call"); /* initial refcount dropped by grpc_call_destroy */ grpc_call_stack_init(&exec_ctx, channel_stack, 1, destroy_call, call, diff --git a/src/core/lib/surface/channel.c b/src/core/lib/surface/channel.c index 2cf6d8890a..6d2b1c4935 100644 --- a/src/core/lib/surface/channel.c +++ b/src/core/lib/surface/channel.c @@ -81,7 +81,7 @@ struct grpc_channel { CHANNEL_FROM_CHANNEL_STACK(grpc_channel_stack_from_top_element(top_elem)) /* the protobuf library will (by default) start warning at 100megs */ -#define DEFAULT_MAX_MESSAGE_LENGTH (100 * 1024 * 1024) +#define DEFAULT_MAX_MESSAGE_LENGTH (4 * 1024 * 1024) static void destroy_channel(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error); |