From 0ca0a6f341eb713fa9aa21289ec4f0ecf3c4e93c Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 5 Nov 2019 11:24:17 -0800 Subject: [PATCH] Remove new GRPC_CLOSURE_SCHED occurences --- src/core/tsi/alts/handshaker/alts_handshaker_client.cc | 8 +++++--- src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index 7318d6ddeb6..5d797e51e6d 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -429,9 +429,11 @@ static void handshaker_client_destruct(alts_handshaker_client* c) { // TODO(apolcyn): we could remove this indirection and call // grpc_call_unref inline if there was an internal variant of // grpc_call_unref that didn't need to flush an ExecCtx. - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(handshaker_call_unref, client->call, - grpc_schedule_on_exec_ctx), - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + GRPC_CLOSURE_CREATE(handshaker_call_unref, client->call, + grpc_schedule_on_exec_ctx), + GRPC_ERROR_NONE); } } diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index e56448d798c..edd95c38386 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -419,7 +419,7 @@ static tsi_result handshaker_next( // stack. Doing so avoids potential lock cycles between g_init_mu and other // mutexes within core that might be held on the current call stack // (note that g_init_mu gets acquired during channel creation). - GRPC_CLOSURE_SCHED(&args->closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &args->closure, GRPC_ERROR_NONE); } else { tsi_result ok = alts_tsi_handshaker_continue_handshaker_next( handshaker, received_bytes, received_bytes_size, cb, user_data);