Merge pull request #13658 from grpc/revert-13058-execctx

Revert "All instances of exec_ctx being passed around in src/core removed"

1 files changed, 14 insertions, 10 deletions

diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc
index 599e0e16e2..2810082837 100644
--- a/test/core/handshake/readahead_handshaker_server_ssl.cc
+++ b/test/core/handshake/readahead_handshaker_server_ssl.cc
@@ -49,37 +49,41 @@
  * to the security_handshaker). This test is meant to protect code relying on
  * this functionality that lives outside of this repo. */
 
-static void readahead_handshaker_destroy(grpc_handshaker* handshaker) {
+static void readahead_handshaker_destroy(grpc_exec_ctx* ctx,
+                                         grpc_handshaker* handshaker) {
   gpr_free(handshaker);
 }
 
-static void readahead_handshaker_shutdown(grpc_handshaker* handshaker,
+static void readahead_handshaker_shutdown(grpc_exec_ctx* ctx,
+                                          grpc_handshaker* handshaker,
                                           grpc_error* error) {}
 
 static void readahead_handshaker_do_handshake(
-    grpc_handshaker* handshaker, grpc_tcp_server_acceptor* acceptor,
-    grpc_closure* on_handshake_done, grpc_handshaker_args* args) {
-  grpc_endpoint_read(args->endpoint, args->read_buffer, on_handshake_done);
+    grpc_exec_ctx* ctx, grpc_handshaker* handshaker,
+    grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done,
+    grpc_handshaker_args* args) {
+  grpc_endpoint_read(ctx, args->endpoint, args->read_buffer, on_handshake_done);
 }
 
 const grpc_handshaker_vtable readahead_handshaker_vtable = {
     readahead_handshaker_destroy, readahead_handshaker_shutdown,
     readahead_handshaker_do_handshake};
 
-static grpc_handshaker* readahead_handshaker_create() {
+static grpc_handshaker* readahead_handshaker_create(grpc_exec_ctx* ctx) {
   grpc_handshaker* h = (grpc_handshaker*)gpr_zalloc(sizeof(grpc_handshaker));
   grpc_handshaker_init(&readahead_handshaker_vtable, h);
   return h;
 }
 
 static void readahead_handshaker_factory_add_handshakers(
-    grpc_handshaker_factory* hf, const grpc_channel_args* args,
-    grpc_handshake_manager* handshake_mgr) {
-  grpc_handshake_manager_add(handshake_mgr, readahead_handshaker_create());
+    grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* hf,
+    const grpc_channel_args* args, grpc_handshake_manager* handshake_mgr) {
+  grpc_handshake_manager_add(handshake_mgr,
+                             readahead_handshaker_create(exec_ctx));
 }
 
 static void readahead_handshaker_factory_destroy(
-    grpc_handshaker_factory* handshaker_factory) {}
+    grpc_exec_ctx* exec_ctx, grpc_handshaker_factory* handshaker_factory) {}
 
 static const grpc_handshaker_factory_vtable
     readahead_handshaker_factory_vtable = {