diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-11-23 16:39:08 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-11-23 16:39:08 -0800 |
| commit | 61efb98edaffb24ce0b9064751d6868ce8fd1b24 (patch) | |
| tree | 2aa88db0c845751203d07bf47498196b1a6e46de /test/core | |
| parent | e5c247793aeaba2aed425c3ea1e56ba4f418c6e9 (diff) | |
| parent | ab33b488c42c1238b1b2ebbf3bf4f0db61103497 (diff) | |
Merge branch 'connected-subchannel' of github.com:ctiller/grpc into connected-subchannel
Diffstat (limited to 'test/core')
| -rw-r--r-- | test/core/end2end/fixtures/h2_uchannel.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/core/end2end/fixtures/h2_uchannel.c b/test/core/end2end/fixtures/h2_uchannel.c index 43615d8836..3add8e8007 100644 --- a/test/core/end2end/fixtures/h2_uchannel.c +++ b/test/core/end2end/fixtures/h2_uchannel.c @@ -237,7 +237,8 @@ grpc_connectivity_state g_state = GRPC_CHANNEL_IDLE; static void state_changed(grpc_exec_ctx *exec_ctx, void *arg, int success) { if (g_state != GRPC_CHANNEL_READY) { - grpc_subchannel_notify_on_state_change(exec_ctx, arg, &g_state, grpc_closure_create(state_changed, arg)); + grpc_subchannel_notify_on_state_change( + exec_ctx, arg, &g_state, grpc_closure_create(state_changed, arg)); } } @@ -246,12 +247,14 @@ static grpc_connected_subchannel *connect_subchannel(grpc_subchannel *c) { grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_pollset_init(&pollset); grpc_subchannel_add_interested_party(&exec_ctx, c, &pollset); - grpc_subchannel_notify_on_state_change(&exec_ctx, c, &g_state, grpc_closure_create(state_changed, c)); + grpc_subchannel_notify_on_state_change(&exec_ctx, c, &g_state, + grpc_closure_create(state_changed, c)); grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&pollset)); while (g_state != GRPC_CHANNEL_READY) { grpc_pollset_worker worker; - grpc_pollset_work(&exec_ctx, &pollset, &worker, gpr_now(GPR_CLOCK_REALTIME), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); + grpc_pollset_work(&exec_ctx, &pollset, &worker, gpr_now(GPR_CLOCK_REALTIME), + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); gpr_mu_unlock(GRPC_POLLSET_MU(&pollset)); grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&pollset)); |