From 9f7dc3a4e5c3eeb6524472c6dc694f0600d03688 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 22 Sep 2015 10:47:08 -0700
Subject: Move argument passing to start of list

---
 src/core/client_config/resolvers/dns_resolver.c      | 16 ++++++++--------
 src/core/client_config/resolvers/sockaddr_resolver.c |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/core/client_config/resolvers')

diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c
index 66430c43cb..781f1a9e23 100644
--- a/src/core/client_config/resolvers/dns_resolver.c
+++ b/src/core/client_config/resolvers/dns_resolver.c
@@ -128,7 +128,7 @@ dns_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config
     }
   else
     {
-      dns_maybe_finish_next_locked (r, closure_list);
+      dns_maybe_finish_next_locked (exec_ctx, r);
     }
   gpr_mu_unlock (&r->mu);
 }
@@ -152,14 +152,14 @@ dns_on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses *
 	  memset (&args, 0, sizeof (args));
 	  args.addr = (struct sockaddr *) (addresses->addrs[i].addr);
 	  args.addr_len = (size_t) addresses->addrs[i].len;
-	  subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args, closure_list);
+	  subchannels[i] = grpc_subchannel_factory_create_subchannel (exec_ctx, r->subchannel_factory, &args);
 	}
       memset (&lb_policy_args, 0, sizeof (lb_policy_args));
       lb_policy_args.subchannels = subchannels;
       lb_policy_args.num_subchannels = addresses->naddrs;
       lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args);
       grpc_client_config_set_lb_policy (config, lb_policy);
-      GRPC_LB_POLICY_UNREF (lb_policy, "construction", closure_list);
+      GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "construction");
       grpc_resolved_addresses_destroy (addresses);
       gpr_free (subchannels);
     }
@@ -168,14 +168,14 @@ dns_on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses *
   r->resolving = 0;
   if (r->resolved_config)
     {
-      grpc_client_config_unref (r->resolved_config, closure_list);
+      grpc_client_config_unref (exec_ctx, r->resolved_config);
     }
   r->resolved_config = config;
   r->resolved_version++;
-  dns_maybe_finish_next_locked (r, closure_list);
+  dns_maybe_finish_next_locked (exec_ctx, r);
   gpr_mu_unlock (&r->mu);
 
-  GRPC_RESOLVER_UNREF (&r->base, "dns-resolving", closure_list);
+  GRPC_RESOLVER_UNREF (exec_ctx, &r->base, "dns-resolving");
 }
 
 static void
@@ -210,9 +210,9 @@ dns_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * gr)
   gpr_mu_destroy (&r->mu);
   if (r->resolved_config)
     {
-      grpc_client_config_unref (r->resolved_config, closure_list);
+      grpc_client_config_unref (exec_ctx, r->resolved_config);
     }
-  grpc_subchannel_factory_unref (r->subchannel_factory, closure_list);
+  grpc_subchannel_factory_unref (exec_ctx, r->subchannel_factory);
   gpr_free (r->name);
   gpr_free (r->default_port);
   gpr_free (r->lb_policy_name);
diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c
index 2887cffcd4..1b2eac997d 100644
--- a/src/core/client_config/resolvers/sockaddr_resolver.c
+++ b/src/core/client_config/resolvers/sockaddr_resolver.c
@@ -117,7 +117,7 @@ sockaddr_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_c
   GPR_ASSERT (!r->next_completion);
   r->next_completion = on_complete;
   r->target_config = target_config;
-  sockaddr_maybe_finish_next_locked (r, closure_list);
+  sockaddr_maybe_finish_next_locked (exec_ctx, r);
   gpr_mu_unlock (&r->mu);
 }
 
@@ -140,7 +140,7 @@ sockaddr_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, sockaddr_resolver *
 	  memset (&args, 0, sizeof (args));
 	  args.addr = (struct sockaddr *) &r->addrs[i];
 	  args.addr_len = r->addrs_len[i];
-	  subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args, closure_list);
+	  subchannels[i] = grpc_subchannel_factory_create_subchannel (exec_ctx, r->subchannel_factory, &args);
 	}
       memset (&lb_policy_args, 0, sizeof (lb_policy_args));
       lb_policy_args.subchannels = subchannels;
@@ -148,7 +148,7 @@ sockaddr_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, sockaddr_resolver *
       lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args);
       gpr_free (subchannels);
       grpc_client_config_set_lb_policy (cfg, lb_policy);
-      GRPC_LB_POLICY_UNREF (lb_policy, "sockaddr", closure_list);
+      GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "sockaddr");
       r->published = 1;
       *r->target_config = cfg;
       grpc_closure_list_add (closure_list, r->next_completion, 1);
@@ -161,7 +161,7 @@ sockaddr_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * gr)
 {
   sockaddr_resolver *r = (sockaddr_resolver *) gr;
   gpr_mu_destroy (&r->mu);
-  grpc_subchannel_factory_unref (r->subchannel_factory, closure_list);
+  grpc_subchannel_factory_unref (exec_ctx, r->subchannel_factory);
   gpr_free (r->addrs);
   gpr_free (r->addrs_len);
   gpr_free (r->lb_policy_name);
-- 
cgit v1.2.3