Move argument passing to start of list

15 files changed, 53 insertions, 53 deletions

diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c
index 06413eed68..6a0f6c4937 100644
--- a/src/core/iomgr/iomgr.c
+++ b/src/core/iomgr/iomgr.c
@@ -113,7 +113,7 @@ grpc_iomgr_shutdown (void)
 	    }
 	  last_warning_time = gpr_now (GPR_CLOCK_REALTIME);
 	}
-      if (grpc_alarm_check (gpr_inf_future (GPR_CLOCK_MONOTONIC), NULL, &closure_list))
+      if (grpc_alarm_check (gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC), NULL))
 	{
 	  gpr_mu_unlock (&g_mu);
 	  grpc_exec_ctx_finish (&exec_ctx);
diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c
index 9d269d364a..1017a788ff 100644
--- a/src/core/iomgr/resolve_address_posix.c
+++ b/src/core/iomgr/resolve_address_posix.c
@@ -166,7 +166,7 @@ do_request_thread (void *rp)
   grpc_resolve_cb cb = r->cb;
   gpr_free (r->name);
   gpr_free (r->default_port);
-  cb (arg, resolved, &closure_list);
+  cb (&exec_ctx, arg, resolved);
   grpc_iomgr_unregister_object (&r->iomgr_object);
   gpr_free (r);
   grpc_exec_ctx_finish (&exec_ctx);
diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c
index 0b76ba563a..47dfcf29c8 100644
--- a/src/core/security/credentials.c
+++ b/src/core/security/credentials.c
@@ -810,7 +810,7 @@ on_simulated_token_fetch_done (void *user_data)
   grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *) user_data;
   grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) r->creds;
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
-  r->cb (r->user_data, c->md_store->entries, c->md_store->num_entries, GRPC_CREDENTIALS_OK, &closure_list);
+  r->cb (&exec_ctx, r->user_data, c->md_store->entries, c->md_store->num_entries, GRPC_CREDENTIALS_OK);
   grpc_credentials_metadata_request_destroy (r);
   grpc_exec_ctx_finish (&exec_ctx);
 }
@@ -1330,7 +1330,7 @@ plugin_md_request_metadata_ready (void *request, const grpc_metadata * md, size_
 	{
 	  gpr_log (GPR_ERROR, "Getting metadata from plugin failed with error: %s", error_details);
 	}
-      r->cb (r->user_data, NULL, 0, GRPC_CREDENTIALS_ERROR, &closure_list);
+      r->cb (&exec_ctx, r->user_data, NULL, 0, GRPC_CREDENTIALS_ERROR);
     }
   else
     {
@@ -1345,7 +1345,7 @@ plugin_md_request_metadata_ready (void *request, const grpc_metadata * md, size_
 	      md_array[i].value = gpr_slice_from_copied_buffer (md[i].value, md[i].value_length);
 	    }
 	}
-      r->cb (r->user_data, md_array, num_md, GRPC_CREDENTIALS_OK, &closure_list);
+      r->cb (&exec_ctx, r->user_data, md_array, num_md, GRPC_CREDENTIALS_OK);
       if (md_array != NULL)
 	{
 	  for (i = 0; i < num_md; i++)
diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c
index afa4b9971c..eb88a4bfc1 100644
--- a/src/core/security/google_default_credentials.c
+++ b/src/core/security/google_default_credentials.c
@@ -121,7 +121,7 @@ is_stack_running_on_compute_engine (void)
 
   grpc_httpcli_context_init (&context);
 
-  grpc_httpcli_get (&context, &detector.pollset, &request, gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), max_detection_delay), on_compute_engine_detection_http_response, &detector, &closure_list);
+  grpc_httpcli_get (&context, &detector.pollset, &request, gpr_time_add (gpr_now (&exec_ctx, GPR_CLOCK_REALTIME), max_detection_delay), on_compute_engine_detection_http_response, &detector);
 
   grpc_exec_ctx_finish (&exec_ctx);
 
@@ -131,13 +131,13 @@ is_stack_running_on_compute_engine (void)
   while (!detector.is_done)
     {
       grpc_pollset_worker worker;
-      grpc_pollset_work (&detector.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list);
+      grpc_pollset_work (&detector.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC));
     }
   gpr_mu_unlock (GRPC_POLLSET_MU (&detector.pollset));
 
   grpc_httpcli_context_destroy (&context);
   grpc_closure_init (&destroy_closure, destroy_pollset, &detector.pollset);
-  grpc_pollset_shutdown (&detector.pollset, &destroy_closure, &closure_list);
+  grpc_pollset_shutdown (&exec_ctx, &detector.pollset, &destroy_closure);
   grpc_exec_ctx_finish (&exec_ctx);
 
   return detector.success;
diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c
index a1516abb41..68f64c4d7e 100644
--- a/src/core/security/server_auth_filter.c
+++ b/src/core/security/server_auth_filter.c
@@ -134,7 +134,7 @@ on_md_processing_done (void *user_data, const grpc_metadata * consumed_md, size_
       calld->num_consumed_md = num_consumed_md;
       grpc_metadata_batch_filter (&calld->md_op->data.metadata, remove_consumed_md, elem);
       grpc_metadata_array_destroy (&calld->md);
-      calld->on_done_recv->cb (calld->on_done_recv->cb_arg, 1, &closure_list);
+      calld->on_done_recv->cb (&exec_ctx, calld->on_done_recv->cb_arg, 1);
     }
   else
     {
@@ -144,7 +144,7 @@ on_md_processing_done (void *user_data, const grpc_metadata * consumed_md, size_
       message = gpr_slice_from_copied_string (error_details);
       grpc_sopb_reset (calld->recv_ops);
       grpc_transport_stream_op_add_close (&calld->transport_op, status, &message);
-      grpc_call_next_op (elem, &calld->transport_op, &closure_list);
+      grpc_call_next_op (&exec_ctx, elem, &calld->transport_op);
     }
 
   grpc_exec_ctx_finish (&exec_ctx);
diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c
index 7ca7beaf52..98d9e2a876 100644
--- a/src/core/security/server_secure_chttp2.c
+++ b/src/core/security/server_secure_chttp2.c
@@ -300,7 +300,7 @@ grpc_server_add_secure_http2_port (grpc_server * server, const char *addr, grpc_
   gpr_ref_init (&state->refcount, 1);
 
   /* Register with the server only upon success */
-  grpc_server_add_listener (server, state, start, destroy, &closure_list);
+  grpc_server_add_listener (&exec_ctx, server, state, start, destroy);
 
   grpc_exec_ctx_finish (&exec_ctx);
   return port_num;
@@ -317,7 +317,7 @@ error:
     }
   if (tcp)
     {
-      grpc_tcp_server_destroy (tcp, NULL, &closure_list);
+      grpc_tcp_server_destroy (&exec_ctx, tcp, NULL);
     }
   if (state)
     {
diff --git a/src/core/surface/call.c b/src/core/surface/call.c
index 38bcc750b9..6da5272ddc 100644
--- a/src/core/surface/call.c
+++ b/src/core/surface/call.c
@@ -355,7 +355,7 @@ grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 pr
       GRPC_CALL_INTERNAL_REF (call, "receiving");
       initial_op_ptr = &initial_op;
     }
-  grpc_call_stack_init (channel_stack, server_transport_data, initial_op_ptr, CALL_STACK_FROM_CALL (call), &closure_list);
+  grpc_call_stack_init (channel_stack, server_transport_data, initial_op_ptr, CALL_STACK_FROM_CALL (&exec_ctx, call));
   if (parent_call != NULL)
     {
       GRPC_CALL_INTERNAL_REF (parent_call, "child");
@@ -402,7 +402,7 @@ grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 pr
     }
   if (gpr_time_cmp (send_deadline, gpr_inf_future (send_deadline.clock_type)) != 0)
     {
-      set_deadline_alarm (call, send_deadline, &closure_list);
+      set_deadline_alarm (&exec_ctx, call, send_deadline);
     }
   grpc_exec_ctx_finish (&exec_ctx);
   return call;
@@ -1411,7 +1411,7 @@ grpc_call_destroy (grpc_call * c)
 	  c->sibling_next->sibling_prev = c->sibling_prev;
 	}
       gpr_mu_unlock (&parent->mu);
-      GRPC_CALL_INTERNAL_UNREF (parent, "child", &closure_list);
+      GRPC_CALL_INTERNAL_UNREF (&exec_ctx, parent, "child");
     }
 
   lock (c);
@@ -1419,13 +1419,13 @@ grpc_call_destroy (grpc_call * c)
   c->destroy_called = 1;
   if (c->have_alarm)
     {
-      grpc_alarm_cancel (&c->alarm, &closure_list);
+      grpc_alarm_cancel (&exec_ctx, &c->alarm);
     }
   cancel = c->read_state != READ_STATE_STREAM_CLOSED;
-  unlock (c, &closure_list);
+  unlock (&exec_ctx, c);
   if (cancel)
     grpc_call_cancel (c, NULL);
-  GRPC_CALL_INTERNAL_UNREF (c, "destroy", &closure_list);
+  GRPC_CALL_INTERNAL_UNREF (&exec_ctx, c, "destroy");
   grpc_exec_ctx_finish (&exec_ctx);
 }
 
@@ -1444,7 +1444,7 @@ grpc_call_cancel_with_status (grpc_call * c, grpc_status_code status, const char
   GPR_ASSERT (reserved == NULL);
   lock (c);
   r = cancel_with_status (c, status, description);
-  unlock (c, &closure_list);
+  unlock (&exec_ctx, c);
   grpc_exec_ctx_finish (&exec_ctx);
   return r;
 }
@@ -1516,7 +1516,7 @@ grpc_call_get_peer (grpc_call * call)
 {
   grpc_call_element *elem = CALL_ELEM_FROM_CALL (call, 0);
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
-  char *result = elem->filter->get_peer (elem, &closure_list);
+  char *result = elem->filter->get_peer (&exec_ctx, elem);
   grpc_exec_ctx_finish (&exec_ctx);
   return result;
 }
@@ -1756,7 +1756,7 @@ grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void
     {
       grpc_cq_begin_op (call->cq);
       GRPC_CALL_INTERNAL_REF (call, "completion");
-      grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (call), &closure_list);
+      grpc_cq_end_op (call->cq, tag, 1, done_completion, call, allocate_completion (&exec_ctx, call));
       error = GRPC_CALL_OK;
       goto done;
     }
@@ -1992,7 +1992,7 @@ grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void
   GRPC_CALL_INTERNAL_REF (call, "completion");
   grpc_cq_begin_op (call->cq);
 
-  error = grpc_call_start_ioreq_and_call_back (call, reqs, out, finish_func, tag, &closure_list);
+  error = grpc_call_start_ioreq_and_call_back (&exec_ctx, call, reqs, out, finish_func, tag);
 done:
   grpc_exec_ctx_finish (&exec_ctx);
   return error;
diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c
index 1896555eba..a6478c3979 100644
--- a/src/core/surface/channel.c
+++ b/src/core/surface/channel.c
@@ -322,9 +322,9 @@ grpc_channel_destroy (grpc_channel * channel)
   memset (&op, 0, sizeof (op));
   op.disconnect = 1;
   elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CHANNEL (channel), 0);
-  elem->filter->start_transport_op (elem, &op, &closure_list);
+  elem->filter->start_transport_op (&exec_ctx, elem, &op);
 
-  GRPC_CHANNEL_INTERNAL_UNREF (channel, "channel", &closure_list);
+  GRPC_CHANNEL_INTERNAL_UNREF (&exec_ctx, channel, "channel");
 
   grpc_exec_ctx_finish (&exec_ctx);
 }
diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c
index 30017b3b9f..f9195a4ccb 100644
--- a/src/core/surface/channel_connectivity.c
+++ b/src/core/surface/channel_connectivity.c
@@ -52,7 +52,7 @@ grpc_channel_check_connectivity_state (grpc_channel * channel, int try_to_connec
       gpr_log (GPR_ERROR, "grpc_channel_check_connectivity_state called on something that is " "not a client channel, but '%s'", client_channel_elem->filter->name);
       return GRPC_CHANNEL_FATAL_FAILURE;
     }
-  state = grpc_client_channel_check_connectivity_state (client_channel_elem, try_to_connect, &closure_list);
+  state = grpc_client_channel_check_connectivity_state (&exec_ctx, client_channel_elem, try_to_connect);
   grpc_exec_ctx_finish (&exec_ctx);
   return state;
 }
@@ -195,7 +195,7 @@ grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity
   w->tag = tag;
   w->channel = channel;
 
-  grpc_alarm_init (&w->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), timeout_complete, w, gpr_now (GPR_CLOCK_MONOTONIC), &closure_list);
+  grpc_alarm_init (&w->alarm, gpr_convert_clock_type (deadline, GPR_CLOCK_MONOTONIC), timeout_complete, w, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC));
 
   if (client_channel_elem->filter != &grpc_client_channel_filter)
     {
@@ -205,8 +205,8 @@ grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity
   else
     {
       GRPC_CHANNEL_INTERNAL_REF (channel, "watch_connectivity");
-      grpc_client_channel_add_interested_party (client_channel_elem, grpc_cq_pollset (cq), &closure_list);
-      grpc_client_channel_watch_connectivity_state (client_channel_elem, &w->state, &w->on_complete, &closure_list);
+      grpc_client_channel_add_interested_party (client_channel_elem, grpc_cq_pollset (&exec_ctx, cq));
+      grpc_client_channel_watch_connectivity_state (&exec_ctx, client_channel_elem, &w->state, &w->on_complete);
     }
 
   grpc_exec_ctx_finish (&exec_ctx);
diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c
index 10c57ae9ad..afd5c4d084 100644
--- a/src/core/surface/channel_create.c
+++ b/src/core/surface/channel_create.c
@@ -208,7 +208,7 @@ grpc_insecure_channel_create (const char *target, const grpc_channel_args * args
   filters[n++] = &grpc_client_channel_filter;
   GPR_ASSERT (n <= MAX_FILTERS);
 
-  channel = grpc_channel_create_from_filters (target, filters, n, args, mdctx, 1, &closure_list);
+  channel = grpc_channel_create_from_filters (&exec_ctx, target, filters, n, args, mdctx, 1);
 
   f = gpr_malloc (sizeof (*f));
   f->base.vtable = &subchannel_factory_vtable;
@@ -224,9 +224,9 @@ grpc_insecure_channel_create (const char *target, const grpc_channel_args * args
       return NULL;
     }
 
-  grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (channel), resolver, &closure_list);
-  GRPC_RESOLVER_UNREF (resolver, "create", &closure_list);
-  grpc_subchannel_factory_unref (&f->base, &closure_list);
+  grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (&exec_ctx, channel), resolver);
+  GRPC_RESOLVER_UNREF (&exec_ctx, resolver, "create");
+  grpc_subchannel_factory_unref (&exec_ctx, &f->base);
 
   grpc_exec_ctx_finish (&exec_ctx);
 
diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c
index ff1c20e9f0..8867a2deb5 100644
--- a/src/core/surface/completion_queue.c
+++ b/src/core/surface/completion_queue.c
@@ -214,7 +214,7 @@ grpc_completion_queue_next (grpc_completion_queue * cc, gpr_timespec deadline, v
 	  ret.type = GRPC_OP_COMPLETE;
 	  ret.success = c->next & 1u;
 	  ret.tag = c->tag;
-	  c->done (c->done_arg, c, &closure_list);
+	  c->done (&exec_ctx, c->done_arg, c);
 	  break;
 	}
       if (cc->shutdown)
@@ -233,7 +233,7 @@ grpc_completion_queue_next (grpc_completion_queue * cc, gpr_timespec deadline, v
 	  break;
 	}
       first_loop = 0;
-      grpc_pollset_work (&cc->pollset, &worker, now, deadline, &closure_list);
+      grpc_pollset_work (&exec_ctx, &cc->pollset, &worker, now, deadline);
     }
   GRPC_SURFACE_TRACE_RETURNED_EVENT (cc, &ret);
   GRPC_CQ_INTERNAL_UNREF (cc, "next");
@@ -304,7 +304,7 @@ grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec
 	      ret.type = GRPC_OP_COMPLETE;
 	      ret.success = c->next & 1u;
 	      ret.tag = c->tag;
-	      c->done (c->done_arg, c, &closure_list);
+	      c->done (&exec_ctx, c->done_arg, c);
 	      goto done;
 	    }
 	  prev = c;
@@ -335,7 +335,7 @@ grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec
 	  break;
 	}
       first_loop = 0;
-      grpc_pollset_work (&cc->pollset, &worker, now, deadline, &closure_list);
+      grpc_pollset_work (&exec_ctx, &cc->pollset, &worker, now, deadline);
       del_plucker (cc, tag, &worker);
     }
 done:
@@ -366,7 +366,7 @@ grpc_completion_queue_shutdown (grpc_completion_queue * cc)
       GPR_ASSERT (!cc->shutdown);
       cc->shutdown = 1;
       gpr_mu_unlock (GRPC_POLLSET_MU (&cc->pollset));
-      grpc_pollset_shutdown (&cc->pollset, &cc->pollset_destroy_done, &closure_list);
+      grpc_pollset_shutdown (&exec_ctx, &cc->pollset, &cc->pollset_destroy_done);
     }
   grpc_exec_ctx_finish (&exec_ctx);
 }
diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c
index 26c53410f3..40a4e07891 100644
--- a/src/core/surface/lame_client.c
+++ b/src/core/surface/lame_client.c
@@ -165,7 +165,7 @@ grpc_lame_client_channel_create (const char *target, grpc_status_code error_code
   channel_data *chand;
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   static const grpc_channel_filter *filters[] = { &lame_filter };
-  channel = grpc_channel_create_from_filters (target, filters, 1, NULL, grpc_mdctx_create (), 1, &closure_list);
+  channel = grpc_channel_create_from_filters (target, filters, 1, NULL, grpc_mdctx_create (&exec_ctx, ), 1);
   elem = grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0);
   GPR_ASSERT (elem->filter == &lame_filter);
   chand = (channel_data *) elem->channel_data;
diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c
index 96ddfd8035..d793e32e0d 100644
--- a/src/core/surface/secure_channel_create.c
+++ b/src/core/surface/secure_channel_create.c
@@ -284,7 +284,7 @@ grpc_secure_channel_create (grpc_credentials * creds, const char *target, const
   filters[n++] = &grpc_client_channel_filter;
   GPR_ASSERT (n <= MAX_FILTERS);
 
-  channel = grpc_channel_create_from_filters (target, filters, n, args_copy, mdctx, 1, &closure_list);
+  channel = grpc_channel_create_from_filters (&exec_ctx, target, filters, n, args_copy, mdctx, 1);
 
   f = gpr_malloc (sizeof (*f));
   f->base.vtable = &subchannel_factory_vtable;
@@ -302,9 +302,9 @@ grpc_secure_channel_create (grpc_credentials * creds, const char *target, const
       return NULL;
     }
 
-  grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (channel), resolver, &closure_list);
-  GRPC_RESOLVER_UNREF (resolver, "create", &closure_list);
-  grpc_subchannel_factory_unref (&f->base, &closure_list);
+  grpc_client_channel_set_resolver (grpc_channel_get_channel_stack (&exec_ctx, channel), resolver);
+  GRPC_RESOLVER_UNREF (&exec_ctx, resolver, "create");
+  grpc_subchannel_factory_unref (&exec_ctx, &f->base);
   GRPC_SECURITY_CONNECTOR_UNREF (&connector->base, "channel_create");
 
   grpc_channel_args_destroy (args_copy);
diff --git a/src/core/surface/server.c b/src/core/surface/server.c
index 83fe3a7686..98bfe71c15 100644
--- a/src/core/surface/server.c
+++ b/src/core/surface/server.c
@@ -991,7 +991,7 @@ grpc_server_start (grpc_server * server)
 
   for (l = server->listeners; l; l = l->next)
     {
-      l->start (server, l->arg, server->pollsets, server->cq_count, &closure_list);
+      l->start (&exec_ctx, server, l->arg, server->pollsets, server->cq_count);
     }
 
   grpc_exec_ctx_finish (&exec_ctx);
@@ -1124,7 +1124,7 @@ grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * c
   grpc_cq_begin_op (cq);
   if (server->shutdown_published)
     {
-      grpc_cq_end_op (cq, tag, 1, done_published_shutdown, NULL, gpr_malloc (sizeof (grpc_cq_completion)), &closure_list);
+      grpc_cq_end_op (cq, tag, 1, done_published_shutdown, NULL, gpr_malloc (sizeof (&exec_ctx, grpc_cq_completion)));
       gpr_mu_unlock (&server->mu_global);
       goto done;
     }
@@ -1144,21 +1144,21 @@ grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * c
 
   /* collect all unregistered then registered calls */
   gpr_mu_lock (&server->mu_call);
-  kill_pending_work_locked (server, &closure_list);
+  kill_pending_work_locked (&exec_ctx, server);
   gpr_mu_unlock (&server->mu_call);
 
   gpr_atm_rel_store (&server->shutdown_flag, 1);
-  maybe_finish_shutdown (server, &closure_list);
+  maybe_finish_shutdown (&exec_ctx, server);
   gpr_mu_unlock (&server->mu_global);
 
   /* Shutdown listeners */
   for (l = server->listeners; l; l = l->next)
     {
       grpc_closure_init (&l->destroy_done, listener_destroy_done, server);
-      l->destroy (server, l->arg, &l->destroy_done, &closure_list);
+      l->destroy (&exec_ctx, server, l->arg, &l->destroy_done);
     }
 
-  channel_broadcaster_shutdown (&broadcaster, 1, 0, &closure_list);
+  channel_broadcaster_shutdown (&exec_ctx, &broadcaster, 1, 0);
 
 done:
   grpc_exec_ctx_finish (&exec_ctx);
@@ -1174,7 +1174,7 @@ grpc_server_cancel_all_calls (grpc_server * server)
   channel_broadcaster_init (server, &broadcaster);
   gpr_mu_unlock (&server->mu_global);
 
-  channel_broadcaster_shutdown (&broadcaster, 0, 1, &closure_list);
+  channel_broadcaster_shutdown (&exec_ctx, &broadcaster, 0, 1);
   grpc_exec_ctx_finish (&exec_ctx);
 }
 
@@ -1197,7 +1197,7 @@ grpc_server_destroy (grpc_server * server)
 
   gpr_mu_unlock (&server->mu_global);
 
-  server_unref (server, &closure_list);
+  server_unref (&exec_ctx, server);
   grpc_exec_ctx_finish (&exec_ctx);
 }
 
@@ -1297,7 +1297,7 @@ grpc_server_request_call (grpc_server * server, grpc_call ** call, grpc_call_det
   rc->call = call;
   rc->data.batch.details = details;
   rc->data.batch.initial_metadata = initial_metadata;
-  error = queue_call_request (server, rc, &closure_list);
+  error = queue_call_request (&exec_ctx, server, rc);
 done:
   grpc_exec_ctx_finish (&exec_ctx);
   return error;
@@ -1327,7 +1327,7 @@ grpc_server_request_registered_call (grpc_server * server, void *rm, grpc_call *
   rc->data.registered.deadline = deadline;
   rc->data.registered.initial_metadata = initial_metadata;
   rc->data.registered.optional_payload = optional_payload;
-  error = queue_call_request (server, rc, &closure_list);
+  error = queue_call_request (&exec_ctx, server, rc);
 done:
   grpc_exec_ctx_finish (&exec_ctx);
   return error;
diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c
index 23b36b5f37..1f000f450a 100644
--- a/src/core/surface/server_chttp2.c
+++ b/src/core/surface/server_chttp2.c
@@ -135,7 +135,7 @@ grpc_server_add_insecure_http2_port (grpc_server * server, const char *addr)
   grpc_resolved_addresses_destroy (resolved);
 
   /* Register with the server only upon success */
-  grpc_server_add_listener (server, tcp, start, destroy, &closure_list);
+  grpc_server_add_listener (&exec_ctx, server, tcp, start, destroy);
   goto done;
 
 /* Error path: cleanup and return */