Move argument passing to start of list

9 files changed, 37 insertions, 37 deletions

diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c
index bea0371053..32d08a7c6a 100644
--- a/test/core/iomgr/endpoint_tests.c
+++ b/test/core/iomgr/endpoint_tests.c
@@ -153,7 +153,7 @@ read_and_write_test_read_handler (grpc_exec_ctx * exec_ctx, void *data, int succ
     }
   else if (success)
     {
-      grpc_endpoint_read (state->read_ep, &state->incoming, &state->done_read, closure_list);
+      grpc_endpoint_read (exec_ctx, state->read_ep, &state->incoming, &state->done_read);
     }
 }
 
@@ -176,7 +176,7 @@ read_and_write_test_write_handler (grpc_exec_ctx * exec_ctx, void *data, int suc
 	  slices = allocate_blocks (state->current_write_size, 8192, &nslices, &state->current_write_data);
 	  gpr_slice_buffer_reset_and_unref (&state->outgoing);
 	  gpr_slice_buffer_addn (&state->outgoing, slices, nslices);
-	  grpc_endpoint_write (state->write_ep, &state->outgoing, &state->done_write, closure_list);
+	  grpc_endpoint_write (exec_ctx, state->write_ep, &state->outgoing, &state->done_write);
 	  free (slices);
 	  return;
 	}
diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c
index d8b4032162..82d6206c86 100644
--- a/test/core/iomgr/fd_posix_test.c
+++ b/test/core/iomgr/fd_posix_test.c
@@ -129,10 +129,10 @@ session_shutdown_cb (void *arg,	/*session */
 {
   session *se = arg;
   server *sv = se->sv;
-  grpc_fd_orphan (se->em_fd, NULL, "a", closure_list);
+  grpc_fd_orphan (exec_ctx, se->em_fd, NULL, "a");
   gpr_free (se);
   /* Start to shutdown listen fd. */
-  grpc_fd_shutdown (sv->em_fd, closure_list);
+  grpc_fd_shutdown (exec_ctx, sv->em_fd);
 }
 
 /* Called when data become readable in a session. */
@@ -148,7 +148,7 @@ session_read_cb (void *arg,	/*session */
 
   if (!success)
     {
-      session_shutdown_cb (arg, 1, closure_list);
+      session_shutdown_cb (exec_ctx, arg, 1);
       return;
     }
 
@@ -167,7 +167,7 @@ session_read_cb (void *arg,	/*session */
      been drained, In such a case, read() returns -1 and set errno to EAGAIN. */
   if (read_once == 0)
     {
-      session_shutdown_cb (arg, 1, closure_list);
+      session_shutdown_cb (exec_ctx, arg, 1);
     }
   else if (read_once == -1)
     {
@@ -181,7 +181,7 @@ session_read_cb (void *arg,	/*session */
 	     TODO(chenw): in multi-threaded version, callback and polling can be
 	     run in different threads. polling may catch a persist read edge event
 	     before notify_on_read is called.  */
-	  grpc_fd_notify_on_read (se->em_fd, &se->session_read_closure, closure_list);
+	  grpc_fd_notify_on_read (exec_ctx, se->em_fd, &se->session_read_closure);
 	}
       else
 	{
@@ -199,7 +199,7 @@ listen_shutdown_cb (void *arg /*server */ , int success,
 {
   server *sv = arg;
 
-  grpc_fd_orphan (sv->em_fd, NULL, "b", closure_list);
+  grpc_fd_orphan (exec_ctx, sv->em_fd, NULL, "b");
 
   gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
   sv->done = 1;
@@ -222,7 +222,7 @@ listen_cb (void *arg,		 /*=sv_arg*/
 
   if (!success)
     {
-      listen_shutdown_cb (arg, 1, closure_list);
+      listen_shutdown_cb (exec_ctx, arg, 1);
       return;
     }
 
@@ -234,12 +234,12 @@ listen_cb (void *arg,		 /*=sv_arg*/
   se = gpr_malloc (sizeof (*se));
   se->sv = sv;
   se->em_fd = grpc_fd_create (fd, "listener");
-  grpc_pollset_add_fd (&g_pollset, se->em_fd, closure_list);
+  grpc_pollset_add_fd (exec_ctx, &g_pollset, se->em_fd);
   se->session_read_closure.cb = session_read_cb;
   se->session_read_closure.cb_arg = se;
-  grpc_fd_notify_on_read (se->em_fd, &se->session_read_closure, closure_list);
+  grpc_fd_notify_on_read (exec_ctx, se->em_fd, &se->session_read_closure);
 
-  grpc_fd_notify_on_read (listen_em_fd, &sv->listen_closure, closure_list);
+  grpc_fd_notify_on_read (exec_ctx, listen_em_fd, &sv->listen_closure);
 }
 
 /* Max number of connections pending to be accepted by listen(). */
@@ -265,11 +265,11 @@ server_start (grpc_exec_ctx * exec_ctx, server * sv)
   GPR_ASSERT (listen (fd, MAX_NUM_FD) == 0);
 
   sv->em_fd = grpc_fd_create (fd, "server");
-  grpc_pollset_add_fd (&g_pollset, sv->em_fd, closure_list);
+  grpc_pollset_add_fd (exec_ctx, &g_pollset, sv->em_fd);
   /* Register to be interested in reading from listen_fd. */
   sv->listen_closure.cb = listen_cb;
   sv->listen_closure.cb_arg = sv;
-  grpc_fd_notify_on_read (sv->em_fd, &sv->listen_closure, closure_list);
+  grpc_fd_notify_on_read (exec_ctx, sv->em_fd, &sv->listen_closure);
 
   return port;
 }
@@ -327,7 +327,7 @@ client_session_shutdown_cb (void *arg /*client */ , int success,
 			    grpc_closure_list * closure_list)
 {
   client *cl = arg;
-  grpc_fd_orphan (cl->em_fd, NULL, "c", closure_list);
+  grpc_fd_orphan (exec_ctx, cl->em_fd, NULL, "c");
   cl->done = 1;
   grpc_pollset_kick (&g_pollset, NULL);
 }
@@ -344,7 +344,7 @@ client_session_write (void *arg,	/*client */
   if (!success)
     {
       gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
-      client_session_shutdown_cb (arg, 1, closure_list);
+      client_session_shutdown_cb (exec_ctx, arg, 1);
       gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
       return;
     }
@@ -364,12 +364,12 @@ client_session_write (void *arg,	/*client */
 	{
 	  cl->write_closure.cb = client_session_write;
 	  cl->write_closure.cb_arg = cl;
-	  grpc_fd_notify_on_write (cl->em_fd, &cl->write_closure, closure_list);
+	  grpc_fd_notify_on_write (exec_ctx, cl->em_fd, &cl->write_closure);
 	  cl->client_write_cnt++;
 	}
       else
 	{
-	  client_session_shutdown_cb (arg, 1, closure_list);
+	  client_session_shutdown_cb (exec_ctx, arg, 1);
 	}
       gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
     }
@@ -409,9 +409,9 @@ client_start (grpc_exec_ctx * exec_ctx, client * cl, int port)
     }
 
   cl->em_fd = grpc_fd_create (fd, "client");
-  grpc_pollset_add_fd (&g_pollset, cl->em_fd, closure_list);
+  grpc_pollset_add_fd (exec_ctx, &g_pollset, cl->em_fd);
 
-  client_session_write (cl, 1, closure_list);
+  client_session_write (exec_ctx, cl, 1);
 }
 
 /* Wait for the signal to shutdown a client. */
diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c
index b93b9a5725..6dcdf9ee25 100644
--- a/test/core/iomgr/tcp_client_posix_test.c
+++ b/test/core/iomgr/tcp_client_posix_test.c
@@ -72,8 +72,8 @@ must_succeed (grpc_exec_ctx * exec_ctx, void *arg, int success)
 {
   GPR_ASSERT (g_connecting != NULL);
   GPR_ASSERT (success);
-  grpc_endpoint_shutdown (g_connecting, closure_list);
-  grpc_endpoint_destroy (g_connecting, closure_list);
+  grpc_endpoint_shutdown (exec_ctx, g_connecting);
+  grpc_endpoint_destroy (exec_ctx, g_connecting);
   g_connecting = NULL;
   finish_connection ();
 }
diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c
index af338249c5..168fc87d16 100644
--- a/test/core/iomgr/tcp_posix_test.c
+++ b/test/core/iomgr/tcp_posix_test.c
@@ -176,7 +176,7 @@ read_cb (grpc_exec_ctx * exec_ctx, void *user_data, int success)
     }
   else
     {
-      grpc_endpoint_read (state->ep, &state->incoming, &state->read_cb, closure_list);
+      grpc_endpoint_read (exec_ctx, state->ep, &state->incoming, &state->read_cb);
       gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
     }
 }
diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c
index 8467e937ee..e59e45a8b2 100644
--- a/test/core/iomgr/tcp_server_posix_test.c
+++ b/test/core/iomgr/tcp_server_posix_test.c
@@ -51,8 +51,8 @@ static int g_nconnects = 0;
 static void
 on_connect (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * tcp)
 {
-  grpc_endpoint_shutdown (tcp, closure_list);
-  grpc_endpoint_destroy (tcp, closure_list);
+  grpc_endpoint_shutdown (exec_ctx, tcp);
+  grpc_endpoint_destroy (exec_ctx, tcp);
 
   gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
   g_nconnects++;
diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c
index 281f14f3b7..3facb9556f 100644
--- a/test/core/security/credentials_test.c
+++ b/test/core/security/credentials_test.c
@@ -461,7 +461,7 @@ compute_engine_httpcli_get_success_override (grpc_exec_ctx * exec_ctx, const grp
 {
   grpc_httpcli_response response = http_response (200, valid_oauth2_json_response);
   validate_compute_engine_http_request (request);
-  on_response (user_data, &response, closure_list);
+  on_response (exec_ctx, user_data, &response);
   return 1;
 }
 
@@ -470,7 +470,7 @@ compute_engine_httpcli_get_failure_override (grpc_exec_ctx * exec_ctx, const grp
 {
   grpc_httpcli_response response = http_response (403, "Not Authorized.");
   validate_compute_engine_http_request (request);
-  on_response (user_data, &response, closure_list);
+  on_response (exec_ctx, user_data, &response);
   return 1;
 }
 
@@ -548,7 +548,7 @@ refresh_token_httpcli_post_success (grpc_exec_ctx * exec_ctx, const grpc_httpcli
 {
   grpc_httpcli_response response = http_response (200, valid_oauth2_json_response);
   validate_refresh_token_http_request (request, body, body_size);
-  on_response (user_data, &response, closure_list);
+  on_response (exec_ctx, user_data, &response);
   return 1;
 }
 
@@ -557,7 +557,7 @@ refresh_token_httpcli_post_failure (grpc_exec_ctx * exec_ctx, const grpc_httpcli
 {
   grpc_httpcli_response response = http_response (403, "Not Authorized.");
   validate_refresh_token_http_request (request, body, body_size);
-  on_response (user_data, &response, closure_list);
+  on_response (exec_ctx, user_data, &response);
   return 1;
 }
 
diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c
index 506918d27c..8832dca817 100644
--- a/test/core/security/jwt_verifier_test.c
+++ b/test/core/security/jwt_verifier_test.c
@@ -203,7 +203,7 @@ httpcli_get_google_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_
   GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl);
   GPR_ASSERT (strcmp (request->host, "www.googleapis.com") == 0);
   GPR_ASSERT (strcmp (request->path, "/robot/v1/metadata/x509/" "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0);
-  on_response (user_data, &response, closure_list);
+  on_response (exec_ctx, user_data, &response);
   gpr_free (response.body);
   return 1;
 }
@@ -246,7 +246,7 @@ httpcli_get_custom_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_
   GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl);
   GPR_ASSERT (strcmp (request->host, "keys.bar.com") == 0);
   GPR_ASSERT (strcmp (request->path, "/jwk/foo@bar.com") == 0);
-  on_response (user_data, &response, closure_list);
+  on_response (exec_ctx, user_data, &response);
   gpr_free (response.body);
   return 1;
 }
@@ -279,7 +279,7 @@ httpcli_get_jwk_set (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * requ
   GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl);
   GPR_ASSERT (strcmp (request->host, "www.googleapis.com") == 0);
   GPR_ASSERT (strcmp (request->path, "/oauth2/v3/certs") == 0);
-  on_response (user_data, &response, closure_list);
+  on_response (exec_ctx, user_data, &response);
   gpr_free (response.body);
   return 1;
 }
@@ -292,7 +292,7 @@ httpcli_get_openid_config (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request
   GPR_ASSERT (strcmp (request->host, "accounts.google.com") == 0);
   GPR_ASSERT (strcmp (request->path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0);
   grpc_httpcli_set_override (httpcli_get_jwk_set, httpcli_post_should_not_be_called);
-  on_response (user_data, &response, closure_list);
+  on_response (exec_ctx, user_data, &response);
   gpr_free (response.body);
   return 1;
 }
@@ -331,7 +331,7 @@ httpcli_get_bad_json (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * req
 {
   grpc_httpcli_response response = http_response (200, gpr_strdup ("{\"bad\": \"stuff\"}"));
   GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl);
-  on_response (user_data, &response, closure_list);
+  on_response (exec_ctx, user_data, &response);
   gpr_free (response.body);
   return 1;
 }
diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c
index 670b19e28c..a1893375ec 100644
--- a/test/core/util/port_posix.c
+++ b/test/core/util/port_posix.c
@@ -247,7 +247,7 @@ got_port_from_server (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_re
       req.path = "/get";
       gpr_log (GPR_DEBUG, "failed port pick from server: retrying");
       sleep (1);
-      grpc_httpcli_get (pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, pr, closure_list);
+      grpc_httpcli_get (pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (exec_ctx, 10), got_port_from_server, pr);
       return;
     }
   GPR_ASSERT (response);
diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c
index 4d1ef62e17..f3a7df1f69 100644
--- a/test/core/util/reconnect_server.c
+++ b/test/core/util/reconnect_server.c
@@ -75,8 +75,8 @@ on_connect (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * tcp)
   gpr_timespec now = gpr_now (GPR_CLOCK_REALTIME);
   timestamp_list *new_tail;
   peer = grpc_endpoint_get_peer (tcp);
-  grpc_endpoint_shutdown (tcp, closure_list);
-  grpc_endpoint_destroy (tcp, closure_list);
+  grpc_endpoint_shutdown (exec_ctx, tcp);
+  grpc_endpoint_destroy (exec_ctx, tcp);
   if (peer)
     {
       last_colon = strrchr (peer, ':');