From f655c85140986a4b1298b1a0820fe76d8b8c6409 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Tue, 6 Sep 2016 10:40:38 -0700
Subject: Add is_resolver bit to grpc_resolved_address.

---
 src/core/ext/lb_policy/grpclb/grpclb.c | 39 +++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 10 deletions(-)

(limited to 'src/core/ext/lb_policy/grpclb/grpclb.c')

diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c
index af913d8a9d..4032b76ac9 100644
--- a/src/core/ext/lb_policy/grpclb/grpclb.c
+++ b/src/core/ext/lb_policy/grpclb/grpclb.c
@@ -309,6 +309,11 @@ static grpc_lb_policy *create_rr(grpc_exec_ctx *exec_ctx,
     if (parse_ipv4(&uri, &sa, &sa_len)) { /* TODO(dgq): add support for ipv6 */
       memcpy(args.addresses->addrs[out_addrs_idx].addr, &sa, sa_len);
       args.addresses->addrs[out_addrs_idx].len = sa_len;
+      // These are, of course, actually balancer addresses.  However, we
+      // want the round_robin LB policy to treat them as normal backend
+      // addresses, since we don't need to talk to balancers in order to
+      // find the balancers themselves.
+      args.addresses->addrs[out_addrs_idx].is_balancer = false;
       ++out_addrs_idx;
     } else {
       gpr_log(GPR_ERROR, "Invalid LB service address '%s', ignoring.",
@@ -414,6 +419,20 @@ static void rr_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg,
 static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
                                   grpc_lb_policy_factory *factory,
                                   grpc_lb_policy_args *args) {
+  // Count the number of gRPC-LB addresses.  There must be at least one.
+  // TODO(roth): For now, we ignore non-balancer addresses, so there must be
+  // at least one balancer address.  In the future, we may change the
+  // behavior such that we fall back to using the non-balancer addresses
+  // if we cannot reach any balancers.  At that time, this should be
+  // changed to allow a list with no balancer addresses, since the
+  // resolver might fail to return a balancer address even when this is
+  // the right LB policy to use.
+  size_t num_grpclb_addrs = 0;
+  for (size_t i = 0; i < args->addresses->naddrs; ++i) {
+    if (args->addresses->addrs[i].is_balancer) ++num_grpclb_addrs;
+  }
+  if (num_grpclb_addrs == 0) return NULL;
+
   glb_lb_policy *glb_policy = gpr_malloc(sizeof(*glb_policy));
   memset(glb_policy, 0, sizeof(*glb_policy));
 
@@ -424,25 +443,25 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
    * Create a client channel over them to communicate with a LB service */
   glb_policy->cc_factory = args->client_channel_factory;
   GPR_ASSERT(glb_policy->cc_factory != NULL);
-  if (args->addresses->naddrs == 0) {
-    return NULL;
-  }
 
   /* construct a target from the args->addresses, in the form
    * ipvX://ip1:port1,ip2:port2,...
    * TODO(dgq): support mixed ip version */
-  char **addr_strs = gpr_malloc(sizeof(char *) * args->addresses->naddrs);
+  char **addr_strs = gpr_malloc(sizeof(char *) * num_grpclb_addrs);
   addr_strs[0] =
       grpc_sockaddr_to_uri((const struct sockaddr *)&args->addresses->addrs[0]);
+  size_t addr_index = 1;
   for (size_t i = 1; i < args->addresses->naddrs; i++) {
-    GPR_ASSERT(grpc_sockaddr_to_string(
-                   &addr_strs[i],
-                   (const struct sockaddr *)&args->addresses->addrs[i],
-                   true) == 0);
+    if (args->addresses->addrs[i].is_balancer) {
+      GPR_ASSERT(grpc_sockaddr_to_string(
+                     &addr_strs[addr_index++],
+                     (const struct sockaddr *)&args->addresses->addrs[i],
+                     true) == 0);
+    }
   }
   size_t uri_path_len;
   char *target_uri_str = gpr_strjoin_sep(
-      (const char **)addr_strs, args->addresses->naddrs, ",", &uri_path_len);
+      (const char **)addr_strs, num_grpclb_addrs, ",", &uri_path_len);
 
   /* will pick using pick_first */
   glb_policy->lb_channel = grpc_client_channel_factory_create_channel(
@@ -450,7 +469,7 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
       GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, NULL);
 
   gpr_free(target_uri_str);
-  for (size_t i = 0; i < args->addresses->naddrs; i++) {
+  for (size_t i = 0; i < num_grpclb_addrs; i++) {
     gpr_free(addr_strs[i]);
   }
   gpr_free(addr_strs);
-- 
cgit v1.2.3


From 989cdcd6103c258efdb6548248b68f01ec44a873 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Tue, 6 Sep 2016 13:28:28 -0700
Subject: clang-format

---
 src/core/ext/lb_policy/grpclb/grpclb.c           | 4 ++--
 src/core/ext/lb_policy/pick_first/pick_first.c   | 3 +--
 src/core/ext/lb_policy/round_robin/round_robin.c | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/core/ext/lb_policy/grpclb/grpclb.c')

diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c
index 4032b76ac9..5d3021b57e 100644
--- a/src/core/ext/lb_policy/grpclb/grpclb.c
+++ b/src/core/ext/lb_policy/grpclb/grpclb.c
@@ -460,8 +460,8 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
     }
   }
   size_t uri_path_len;
-  char *target_uri_str = gpr_strjoin_sep(
-      (const char **)addr_strs, num_grpclb_addrs, ",", &uri_path_len);
+  char *target_uri_str = gpr_strjoin_sep((const char **)addr_strs,
+                                         num_grpclb_addrs, ",", &uri_path_len);
 
   /* will pick using pick_first */
   glb_policy->lb_channel = grpc_client_channel_factory_create_channel(
diff --git a/src/core/ext/lb_policy/pick_first/pick_first.c b/src/core/ext/lb_policy/pick_first/pick_first.c
index 858a53ae55..d374f0e4e5 100644
--- a/src/core/ext/lb_policy/pick_first/pick_first.c
+++ b/src/core/ext/lb_policy/pick_first/pick_first.c
@@ -454,8 +454,7 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
   pick_first_lb_policy *p = gpr_malloc(sizeof(*p));
   memset(p, 0, sizeof(*p));
 
-  p->subchannels =
-      gpr_malloc(sizeof(grpc_subchannel *) * num_addrs);
+  p->subchannels = gpr_malloc(sizeof(grpc_subchannel *) * num_addrs);
   memset(p->subchannels, 0, sizeof(*p->subchannels) * num_addrs);
   grpc_subchannel_args sc_args;
   size_t subchannel_idx = 0;
diff --git a/src/core/ext/lb_policy/round_robin/round_robin.c b/src/core/ext/lb_policy/round_robin/round_robin.c
index 986a57bff9..2dc0a52744 100644
--- a/src/core/ext/lb_policy/round_robin/round_robin.c
+++ b/src/core/ext/lb_policy/round_robin/round_robin.c
@@ -582,8 +582,7 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
   round_robin_lb_policy *p = gpr_malloc(sizeof(*p));
   memset(p, 0, sizeof(*p));
 
-  p->subchannels =
-      gpr_malloc(sizeof(*p->subchannels) * num_addrs);
+  p->subchannels = gpr_malloc(sizeof(*p->subchannels) * num_addrs);
   memset(p->subchannels, 0, sizeof(*p->subchannels) * num_addrs);
 
   grpc_subchannel_args sc_args;
-- 
cgit v1.2.3


From e011b1e4cae5cedebea25f75fda69ba56b124572 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Wed, 7 Sep 2016 08:28:00 -0700
Subject: Move is_balancer into a new struct in the client_config directory.

---
 src/core/ext/client_config/lb_policy_factory.h     |  4 +-
 src/core/ext/client_config/resolver_result.c       | 24 ++++++++++
 src/core/ext/client_config/resolver_result.h       | 24 ++++++++++
 src/core/ext/lb_policy/grpclb/grpclb.c             | 51 ++++++++++------------
 src/core/ext/lb_policy/pick_first/pick_first.c     | 19 ++++----
 src/core/ext/lb_policy/round_robin/round_robin.c   | 19 ++++----
 src/core/ext/resolver/dns/native/dns_resolver.c    | 15 ++++---
 src/core/ext/resolver/sockaddr/sockaddr_resolver.c | 22 ++++------
 src/core/lib/iomgr/resolve_address.h               |  2 -
 src/core/lib/iomgr/resolve_address_posix.c         |  1 -
 src/core/lib/iomgr/resolve_address_windows.c       |  1 -
 src/core/lib/iomgr/unix_sockets_posix.c            |  1 -
 12 files changed, 112 insertions(+), 71 deletions(-)

(limited to 'src/core/ext/lb_policy/grpclb/grpclb.c')

diff --git a/src/core/ext/client_config/lb_policy_factory.h b/src/core/ext/client_config/lb_policy_factory.h
index da1de3579a..6919b1eb98 100644
--- a/src/core/ext/client_config/lb_policy_factory.h
+++ b/src/core/ext/client_config/lb_policy_factory.h
@@ -36,7 +36,7 @@
 
 #include "src/core/ext/client_config/client_channel_factory.h"
 #include "src/core/ext/client_config/lb_policy.h"
-#include "src/core/lib/iomgr/resolve_address.h"
+#include "src/core/ext/client_config/resolver_result.h"
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 
@@ -48,7 +48,7 @@ struct grpc_lb_policy_factory {
 };
 
 typedef struct grpc_lb_policy_args {
-  grpc_resolved_addresses *addresses;
+  grpc_addresses *addresses;
   grpc_client_channel_factory *client_channel_factory;
 } grpc_lb_policy_args;
 
diff --git a/src/core/ext/client_config/resolver_result.c b/src/core/ext/client_config/resolver_result.c
index c6c4166e83..e14f761f05 100644
--- a/src/core/ext/client_config/resolver_result.c
+++ b/src/core/ext/client_config/resolver_result.c
@@ -37,6 +37,30 @@
 
 #include <grpc/support/alloc.h>
 
+grpc_addresses *grpc_addresses_create(size_t num_addresses) {
+  grpc_addresses *addresses = gpr_malloc(sizeof(grpc_addresses));
+  addresses->num_addresses = num_addresses;
+  const size_t addresses_size = sizeof(grpc_address) * num_addresses;
+  addresses->addresses = gpr_malloc(addresses_size);
+  memset(addresses->addresses, 0, addresses_size);
+  return addresses;
+}
+
+void grpc_addresses_set_address(grpc_addresses *addresses, size_t index,
+                                void *address, size_t address_len,
+                                bool is_balancer) {
+  GPR_ASSERT(index < addresses->num_addresses);
+  grpc_address *target = &addresses->addresses[index];
+  memcpy(target->address.addr, address, address_len);
+  target->address.len = address_len;
+  target->is_balancer = is_balancer;
+}
+
+void grpc_addresses_destroy(grpc_addresses *addresses) {
+  gpr_free(addresses->addresses);
+  gpr_free(addresses);
+}
+
 struct grpc_resolver_result {
   gpr_refcount refs;
   grpc_lb_policy *lb_policy;
diff --git a/src/core/ext/client_config/resolver_result.h b/src/core/ext/client_config/resolver_result.h
index 402f7dbd7e..4199ef512a 100644
--- a/src/core/ext/client_config/resolver_result.h
+++ b/src/core/ext/client_config/resolver_result.h
@@ -34,7 +34,31 @@
 #ifndef GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_RESULT_H
 #define GRPC_CORE_EXT_CLIENT_CONFIG_RESOLVER_RESULT_H
 
+#include <stdbool.h>
+
 #include "src/core/ext/client_config/lb_policy.h"
+#include "src/core/lib/iomgr/resolve_address.h"
+
+/** Used to represent addresses returned by the resolver. */
+typedef struct grpc_address {
+  grpc_resolved_address address;
+  bool is_balancer;
+} grpc_address;
+
+typedef struct grpc_addresses {
+  size_t num_addresses;
+  grpc_address *addresses;
+} grpc_addresses;
+
+/** Returns a grpc_addresses struct with enough space for
+    \a num_addresses addresses. */
+grpc_addresses *grpc_addresses_create(size_t num_addresses);
+
+void grpc_addresses_set_address(grpc_addresses *addresses, size_t index,
+                                void *address, size_t address_len,
+                                bool is_balancer);
+
+void grpc_addresses_destroy(grpc_addresses *addresses);
 
 /** Results reported from a grpc_resolver. */
 typedef struct grpc_resolver_result grpc_resolver_result;
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c
index 5d3021b57e..61721a4a9e 100644
--- a/src/core/ext/lb_policy/grpclb/grpclb.c
+++ b/src/core/ext/lb_policy/grpclb/grpclb.c
@@ -296,10 +296,7 @@ static grpc_lb_policy *create_rr(grpc_exec_ctx *exec_ctx,
 
   grpc_lb_policy_args args;
   args.client_channel_factory = glb_policy->cc_factory;
-  args.addresses = gpr_malloc(sizeof(grpc_resolved_addresses));
-  args.addresses->naddrs = serverlist->num_servers;
-  args.addresses->addrs =
-      gpr_malloc(sizeof(grpc_resolved_address) * args.addresses->naddrs);
+  args.addresses = grpc_addresses_create(serverlist->num_servers);
   size_t out_addrs_idx = 0;
   for (size_t i = 0; i < serverlist->num_servers; ++i) {
     grpc_uri uri;
@@ -307,13 +304,12 @@ static grpc_lb_policy *create_rr(grpc_exec_ctx *exec_ctx,
     size_t sa_len;
     uri.path = host_ports[i];
     if (parse_ipv4(&uri, &sa, &sa_len)) { /* TODO(dgq): add support for ipv6 */
-      memcpy(args.addresses->addrs[out_addrs_idx].addr, &sa, sa_len);
-      args.addresses->addrs[out_addrs_idx].len = sa_len;
-      // These are, of course, actually balancer addresses.  However, we
-      // want the round_robin LB policy to treat them as normal backend
-      // addresses, since we don't need to talk to balancers in order to
-      // find the balancers themselves.
-      args.addresses->addrs[out_addrs_idx].is_balancer = false;
+      /* These are, of course, actually balancer addresses. However, we
+       * want the round_robin LB policy to treat them as normal backend
+       * addresses, since we don't need to talk to balancers in order to
+       * find the balancers themselves, so we set is_balancer=false. */
+      grpc_addresses_set_address(args.addresses, out_addrs_idx, &sa, sa_len,
+                                 false /* is_balancer */);
       ++out_addrs_idx;
     } else {
       gpr_log(GPR_ERROR, "Invalid LB service address '%s', ignoring.",
@@ -328,8 +324,7 @@ static grpc_lb_policy *create_rr(grpc_exec_ctx *exec_ctx,
     gpr_free(host_ports[i]);
   }
   gpr_free(host_ports);
-  gpr_free(args.addresses->addrs);
-  gpr_free(args.addresses);
+  grpc_addresses_destroy(args.addresses);
   return rr;
 }
 
@@ -419,17 +414,16 @@ static void rr_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg,
 static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
                                   grpc_lb_policy_factory *factory,
                                   grpc_lb_policy_args *args) {
-  // Count the number of gRPC-LB addresses.  There must be at least one.
-  // TODO(roth): For now, we ignore non-balancer addresses, so there must be
-  // at least one balancer address.  In the future, we may change the
-  // behavior such that we fall back to using the non-balancer addresses
-  // if we cannot reach any balancers.  At that time, this should be
-  // changed to allow a list with no balancer addresses, since the
-  // resolver might fail to return a balancer address even when this is
-  // the right LB policy to use.
+  /* Count the number of gRPC-LB addresses. There must be at least one.
+   * TODO(roth): For now, we ignore non-balancer addresses, but in the
+   * future, we may change the behavior such that we fall back to using
+   * the non-balancer addresses if we cannot reach any balancers. At that
+   * time, this should be changed to allow a list with no balancer addresses,
+   * since the resolver might fail to return a balancer address even when
+   * this is the right LB policy to use. */
   size_t num_grpclb_addrs = 0;
-  for (size_t i = 0; i < args->addresses->naddrs; ++i) {
-    if (args->addresses->addrs[i].is_balancer) ++num_grpclb_addrs;
+  for (size_t i = 0; i < args->addresses->num_addresses; ++i) {
+    if (args->addresses->addresses[i].is_balancer) ++num_grpclb_addrs;
   }
   if (num_grpclb_addrs == 0) return NULL;
 
@@ -448,14 +442,15 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
    * ipvX://ip1:port1,ip2:port2,...
    * TODO(dgq): support mixed ip version */
   char **addr_strs = gpr_malloc(sizeof(char *) * num_grpclb_addrs);
-  addr_strs[0] =
-      grpc_sockaddr_to_uri((const struct sockaddr *)&args->addresses->addrs[0]);
+  addr_strs[0] = grpc_sockaddr_to_uri(
+      (const struct sockaddr *)&args->addresses->addresses[0].address.addr);
   size_t addr_index = 1;
-  for (size_t i = 1; i < args->addresses->naddrs; i++) {
-    if (args->addresses->addrs[i].is_balancer) {
+  for (size_t i = 1; i < args->addresses->num_addresses; i++) {
+    if (args->addresses->addresses[i].is_balancer) {
       GPR_ASSERT(grpc_sockaddr_to_string(
                      &addr_strs[addr_index++],
-                     (const struct sockaddr *)&args->addresses->addrs[i],
+                     (const struct sockaddr *)&args->addresses->addresses[i]
+                         .address.addr,
                      true) == 0);
     }
   }
diff --git a/src/core/ext/lb_policy/pick_first/pick_first.c b/src/core/ext/lb_policy/pick_first/pick_first.c
index d374f0e4e5..9f3a6939e6 100644
--- a/src/core/ext/lb_policy/pick_first/pick_first.c
+++ b/src/core/ext/lb_policy/pick_first/pick_first.c
@@ -443,11 +443,11 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
   GPR_ASSERT(args->addresses != NULL);
   GPR_ASSERT(args->client_channel_factory != NULL);
 
-  // Find the number of backend addresses.  We ignore balancer
-  // addresses, since we don't know how to handle them.
+  /* Find the number of backend addresses. We ignore balancer
+   * addresses, since we don't know how to handle them. */
   size_t num_addrs = 0;
-  for (size_t i = 0; i < args->addresses->naddrs; i++) {
-    if (!args->addresses->addrs[i].is_balancer) ++num_addrs;
+  for (size_t i = 0; i < args->addresses->num_addresses; i++) {
+    if (!args->addresses->addresses[i].is_balancer) ++num_addrs;
   }
   if (num_addrs == 0) return NULL;
 
@@ -458,13 +458,14 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
   memset(p->subchannels, 0, sizeof(*p->subchannels) * num_addrs);
   grpc_subchannel_args sc_args;
   size_t subchannel_idx = 0;
-  for (size_t i = 0; i < args->addresses->naddrs; i++) {
-    // Skip balancer addresses, since we only know how to handle backends.
-    if (args->addresses->addrs[i].is_balancer) continue;
+  for (size_t i = 0; i < args->addresses->num_addresses; i++) {
+    /* Skip balancer addresses, since we only know how to handle backends. */
+    if (args->addresses->addresses[i].is_balancer) continue;
 
     memset(&sc_args, 0, sizeof(grpc_subchannel_args));
-    sc_args.addr = (struct sockaddr *)(args->addresses->addrs[i].addr);
-    sc_args.addr_len = (size_t)args->addresses->addrs[i].len;
+    sc_args.addr =
+        (struct sockaddr *)(&args->addresses->addresses[i].address.addr);
+    sc_args.addr_len = args->addresses->addresses[i].address.len;
 
     grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel(
         exec_ctx, args->client_channel_factory, &sc_args);
diff --git a/src/core/ext/lb_policy/round_robin/round_robin.c b/src/core/ext/lb_policy/round_robin/round_robin.c
index 2dc0a52744..fc1534887a 100644
--- a/src/core/ext/lb_policy/round_robin/round_robin.c
+++ b/src/core/ext/lb_policy/round_robin/round_robin.c
@@ -571,11 +571,11 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
   GPR_ASSERT(args->addresses != NULL);
   GPR_ASSERT(args->client_channel_factory != NULL);
 
-  // Find the number of backend addresses.  We ignore balancer
-  // addresses, since we don't know how to handle them.
+  /* Find the number of backend addresses. We ignore balancer
+   * addresses, since we don't know how to handle them. */
   size_t num_addrs = 0;
-  for (size_t i = 0; i < args->addresses->naddrs; i++) {
-    if (!args->addresses->addrs[i].is_balancer) ++num_addrs;
+  for (size_t i = 0; i < args->addresses->num_addresses; i++) {
+    if (!args->addresses->addresses[i].is_balancer) ++num_addrs;
   }
   if (num_addrs == 0) return NULL;
 
@@ -587,13 +587,14 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
 
   grpc_subchannel_args sc_args;
   size_t subchannel_idx = 0;
-  for (size_t i = 0; i < args->addresses->naddrs; i++) {
-    // Skip balancer addresses, since we only know how to handle backends.
-    if (args->addresses->addrs[i].is_balancer) continue;
+  for (size_t i = 0; i < args->addresses->num_addresses; i++) {
+    /* Skip balancer addresses, since we only know how to handle backends. */
+    if (args->addresses->addresses[i].is_balancer) continue;
 
     memset(&sc_args, 0, sizeof(grpc_subchannel_args));
-    sc_args.addr = (struct sockaddr *)(args->addresses->addrs[i].addr);
-    sc_args.addr_len = (size_t)args->addresses->addrs[i].len;
+    sc_args.addr =
+        (struct sockaddr *)(&args->addresses->addresses[i].address.addr);
+    sc_args.addr_len = args->addresses->addresses[i].address.len;
 
     grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel(
         exec_ctx, args->client_channel_factory, &sc_args);
diff --git a/src/core/ext/resolver/dns/native/dns_resolver.c b/src/core/ext/resolver/dns/native/dns_resolver.c
index 79682e78b5..8fc10d98a8 100644
--- a/src/core/ext/resolver/dns/native/dns_resolver.c
+++ b/src/core/ext/resolver/dns/native/dns_resolver.c
@@ -170,20 +170,25 @@ static void dns_on_resolved(grpc_exec_ctx *exec_ctx, void *arg,
   gpr_mu_lock(&r->mu);
   GPR_ASSERT(r->resolving);
   r->resolving = 0;
-  grpc_resolved_addresses *addresses = r->addresses;
-  if (addresses != NULL) {
+  if (r->addresses != NULL) {
     grpc_lb_policy_args lb_policy_args;
-    result = grpc_resolver_result_create();
     memset(&lb_policy_args, 0, sizeof(lb_policy_args));
-    lb_policy_args.addresses = addresses;
+    lb_policy_args.addresses = grpc_addresses_create(r->addresses->naddrs);
+    for (size_t i = 0; i < r->addresses->naddrs; ++i) {
+      grpc_addresses_set_address(
+          lb_policy_args.addresses, i, &r->addresses->addrs[i].addr,
+          r->addresses->addrs[i].len, false /* is_balancer */);
+    }
+    grpc_resolved_addresses_destroy(r->addresses);
     lb_policy_args.client_channel_factory = r->client_channel_factory;
     lb_policy =
         grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args);
+    grpc_addresses_destroy(lb_policy_args.addresses);
+    result = grpc_resolver_result_create();
     if (lb_policy != NULL) {
       grpc_resolver_result_set_lb_policy(result, lb_policy);
       GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "construction");
     }
-    grpc_resolved_addresses_destroy(addresses);
   } else {
     gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC);
     gpr_timespec next_try = gpr_backoff_step(&r->backoff_state, now);
diff --git a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c
index f0748ef583..94d2f892eb 100644
--- a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c
+++ b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c
@@ -58,7 +58,7 @@ typedef struct {
   char *lb_policy_name;
 
   /** the addresses that we've 'resolved' */
-  grpc_resolved_addresses *addresses;
+  grpc_addresses *addresses;
 
   /** mutex guarding the rest of the state */
   gpr_mu mu;
@@ -142,7 +142,7 @@ static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
   sockaddr_resolver *r = (sockaddr_resolver *)gr;
   gpr_mu_destroy(&r->mu);
   grpc_client_channel_factory_unref(exec_ctx, r->client_channel_factory);
-  grpc_resolved_addresses_destroy(r->addresses);
+  grpc_addresses_destroy(r->addresses);
   gpr_free(r->lb_policy_name);
   gpr_free(r);
 }
@@ -216,22 +216,18 @@ static grpc_resolver *sockaddr_create(
   gpr_slice_buffer_init(&path_parts);
 
   gpr_slice_split(path_slice, ",", &path_parts);
-  r->addresses = gpr_malloc(sizeof(grpc_resolved_addresses));
-  r->addresses->naddrs = path_parts.count;
-  r->addresses->addrs =
-      gpr_malloc(sizeof(grpc_resolved_address) * r->addresses->naddrs);
-
-  for (size_t i = 0; i < r->addresses->naddrs; i++) {
+  r->addresses = grpc_addresses_create(path_parts.count);
+  for (size_t i = 0; i < r->addresses->num_addresses; i++) {
     grpc_uri ith_uri = *args->uri;
     char *part_str = gpr_dump_slice(path_parts.slices[i], GPR_DUMP_ASCII);
     ith_uri.path = part_str;
-    if (!parse(&ith_uri,
-               (struct sockaddr_storage *)(&r->addresses->addrs[i].addr),
-               &r->addresses->addrs[i].len)) {
+    if (!parse(&ith_uri, (struct sockaddr_storage *)(&r->addresses->addresses[i]
+                                                          .address.addr),
+               &r->addresses->addresses[i].address.len)) {
       errors_found = true;
     }
     gpr_free(part_str);
-    r->addresses->addrs[i].is_balancer = lb_enabled;
+    r->addresses->addresses[i].is_balancer = lb_enabled;
     if (errors_found) break;
   }
 
@@ -239,7 +235,7 @@ static grpc_resolver *sockaddr_create(
   gpr_slice_unref(path_slice);
   if (errors_found) {
     gpr_free(r->lb_policy_name);
-    grpc_resolved_addresses_destroy(r->addresses);
+    grpc_addresses_destroy(r->addresses);
     gpr_free(r);
     return NULL;
   }
diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h
index 796e75da91..ddbe375755 100644
--- a/src/core/lib/iomgr/resolve_address.h
+++ b/src/core/lib/iomgr/resolve_address.h
@@ -34,7 +34,6 @@
 #ifndef GRPC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H
 #define GRPC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H
 
-#include <stdbool.h>
 #include <stddef.h>
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr.h"
@@ -44,7 +43,6 @@
 typedef struct {
   char addr[GRPC_MAX_SOCKADDR_SIZE];
   size_t len;
-  bool is_balancer;
 } grpc_resolved_address;
 
 typedef struct {
diff --git a/src/core/lib/iomgr/resolve_address_posix.c b/src/core/lib/iomgr/resolve_address_posix.c
index f69cc09593..4e9f978584 100644
--- a/src/core/lib/iomgr/resolve_address_posix.c
+++ b/src/core/lib/iomgr/resolve_address_posix.c
@@ -132,7 +132,6 @@ static grpc_error *blocking_resolve_address_impl(
   for (resp = result; resp != NULL; resp = resp->ai_next) {
     memcpy(&(*addresses)->addrs[i].addr, resp->ai_addr, resp->ai_addrlen);
     (*addresses)->addrs[i].len = resp->ai_addrlen;
-    (*addresses)->addrs[i].is_balancer = false;
     i++;
   }
   err = GRPC_ERROR_NONE;
diff --git a/src/core/lib/iomgr/resolve_address_windows.c b/src/core/lib/iomgr/resolve_address_windows.c
index e6bb209548..2af8af82dc 100644
--- a/src/core/lib/iomgr/resolve_address_windows.c
+++ b/src/core/lib/iomgr/resolve_address_windows.c
@@ -118,7 +118,6 @@ static grpc_error *blocking_resolve_address_impl(
   for (resp = result; resp != NULL; resp = resp->ai_next) {
     memcpy(&(*addresses)->addrs[i].addr, resp->ai_addr, resp->ai_addrlen);
     (*addresses)->addrs[i].len = resp->ai_addrlen;
-    (*addresses)->addrs[i].is_balancer = false;
     i++;
   }
 
diff --git a/src/core/lib/iomgr/unix_sockets_posix.c b/src/core/lib/iomgr/unix_sockets_posix.c
index 2951286159..0e7670e5a5 100644
--- a/src/core/lib/iomgr/unix_sockets_posix.c
+++ b/src/core/lib/iomgr/unix_sockets_posix.c
@@ -58,7 +58,6 @@ grpc_error *grpc_resolve_unix_domain_address(const char *name,
   un->sun_family = AF_UNIX;
   strcpy(un->sun_path, name);
   (*addrs)->addrs->len = strlen(un->sun_path) + sizeof(un->sun_family) + 1;
-  (*addrs)->addrs->is_balancer = false;
   return GRPC_ERROR_NONE;
 }
 
-- 
cgit v1.2.3


From 64f1f8d0406de950dd5dc84a5323d33c1a4f8c1d Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Fri, 16 Sep 2016 09:00:09 -0700
Subject: clang-format

---
 src/core/ext/client_config/lb_policy_factory.h | 10 +++++-----
 src/core/ext/lb_policy/grpclb/grpclb.c         | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/core/ext/lb_policy/grpclb/grpclb.c')

diff --git a/src/core/ext/client_config/lb_policy_factory.h b/src/core/ext/client_config/lb_policy_factory.h
index 41db806241..b31179cf80 100644
--- a/src/core/ext/client_config/lb_policy_factory.h
+++ b/src/core/ext/client_config/lb_policy_factory.h
@@ -55,7 +55,7 @@ struct grpc_lb_policy_factory {
 typedef struct grpc_lb_address {
   grpc_resolved_address address;
   bool is_balancer;
-  char *balancer_name;  /* For secure naming. */
+  char *balancer_name; /* For secure naming. */
   void *user_data;
 } grpc_lb_address;
 
@@ -66,20 +66,20 @@ typedef struct grpc_lb_addresses {
 
 /** Returns a grpc_addresses struct with enough space for
  * \a num_addresses addresses. */
-grpc_lb_addresses* grpc_lb_addresses_create(size_t num_addresses);
+grpc_lb_addresses *grpc_lb_addresses_create(size_t num_addresses);
 
 /** Sets the value of the address at index \a index of \a addresses.
  * \a address is a socket address of length \a address_len.
  * Takes ownership of \a balancer_name. */
 void grpc_lb_addresses_set_address(grpc_lb_addresses *addresses, size_t index,
                                    void *address, size_t address_len,
-                                   bool is_balancer, char* balancer_name,
+                                   bool is_balancer, char *balancer_name,
                                    void *user_data);
 
 /** Destroys \a addresses.  If \a user_data_destroy is not NULL, it will
  * be invoked to destroy the \a user_data field of each address. */
-void grpc_lb_addresses_destroy(grpc_lb_addresses* addresses,
-                               void (*user_data_destroy)(void*));
+void grpc_lb_addresses_destroy(grpc_lb_addresses *addresses,
+                               void (*user_data_destroy)(void *));
 
 /** Arguments passed to LB policies. */
 typedef struct grpc_lb_policy_args {
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c
index 31e408b259..f286bc9e00 100644
--- a/src/core/ext/lb_policy/grpclb/grpclb.c
+++ b/src/core/ext/lb_policy/grpclb/grpclb.c
@@ -353,7 +353,7 @@ static bool is_server_valid(const grpc_grpclb_server *server, size_t idx,
 
 /* populate \a addresses according to \a serverlist. Returns the number of
  * addresses successfully parsed and added to \a addresses */
-static grpc_lb_addresses* process_serverlist(
+static grpc_lb_addresses *process_serverlist(
     const grpc_grpclb_serverlist *serverlist) {
   size_t num_valid = 0;
   /* first pass: count how many are valid in order to allocate the necessary
@@ -398,7 +398,7 @@ static grpc_lb_addresses* process_serverlist(
     }
 
     /* lb token processing */
-    void* user_data;
+    void *user_data;
     if (server->has_load_balance_token) {
       const size_t lb_token_size =
           GPR_ARRAY_SIZE(server->load_balance_token) - 1;
@@ -414,8 +414,8 @@ static grpc_lb_addresses* process_serverlist(
       user_data = GRPC_MDELEM_LOAD_REPORTING_INITIAL_EMPTY;
     }
 
-    grpc_lb_addresses_set_address(lb_addresses, addr_idx, &addr.addr,
-                                  addr.len, false /* is_balancer */,
+    grpc_lb_addresses_set_address(lb_addresses, addr_idx, &addr.addr, addr.len,
+                                  false /* is_balancer */,
                                   NULL /* balancer_name */, user_data);
     ++addr_idx;
   }
@@ -424,7 +424,7 @@ static grpc_lb_addresses* process_serverlist(
   return lb_addresses;
 }
 
-static void lb_token_destroy(void* token) {
+static void lb_token_destroy(void *token) {
   if (token != NULL) GRPC_MDELEM_UNREF(token);
 }
 
-- 
cgit v1.2.3


From 2b626466af11eed576859499baecf8c807591912 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Fri, 16 Sep 2016 09:53:25 -0700
Subject: Bug fixes and cleanups.

---
 src/core/ext/lb_policy/grpclb/grpclb.c             | 12 +++++++++++-
 src/core/ext/lb_policy/round_robin/round_robin.c   | 12 +-----------
 src/core/ext/resolver/sockaddr/sockaddr_resolver.c |  1 -
 3 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'src/core/ext/lb_policy/grpclb/grpclb.c')

diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c
index f286bc9e00..999122fbe0 100644
--- a/src/core/ext/lb_policy/grpclb/grpclb.c
+++ b/src/core/ext/lb_policy/grpclb/grpclb.c
@@ -300,6 +300,9 @@ typedef struct glb_lb_policy {
    * response has arrived. */
   grpc_grpclb_serverlist *serverlist;
 
+  /** addresses from \a serverlist */
+  grpc_lb_addresses *addresses;
+
   /** list of picks that are waiting on RR's policy connectivity */
   pending_pick *pending_picks;
 
@@ -424,6 +427,7 @@ static grpc_lb_addresses *process_serverlist(
   return lb_addresses;
 }
 
+/* A plugin for grpc_lb_addresses_destroy that unrefs the LB token metadata. */
 static void lb_token_destroy(void *token) {
   if (token != NULL) GRPC_MDELEM_UNREF(token);
 }
@@ -440,7 +444,12 @@ static grpc_lb_policy *create_rr(grpc_exec_ctx *exec_ctx,
 
   grpc_lb_policy *rr = grpc_lb_policy_create(exec_ctx, "round_robin", &args);
 
-  grpc_lb_addresses_destroy(args.addresses, lb_token_destroy);
+  if (glb_policy->addresses != NULL) {
+    /* dispose of the previous version */
+    grpc_lb_addresses_destroy(glb_policy->addresses, lb_token_destroy);
+  }
+  glb_policy->addresses = args.addresses;
+
   return rr;
 }
 
@@ -628,6 +637,7 @@ static void glb_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
     grpc_grpclb_destroy_serverlist(glb_policy->serverlist);
   }
   gpr_mu_destroy(&glb_policy->mu);
+  grpc_lb_addresses_destroy(glb_policy->addresses, lb_token_destroy);
   gpr_free(glb_policy);
 }
 
diff --git a/src/core/ext/lb_policy/round_robin/round_robin.c b/src/core/ext/lb_policy/round_robin/round_robin.c
index 5593a5eccf..0feb0740a2 100644
--- a/src/core/ext/lb_policy/round_robin/round_robin.c
+++ b/src/core/ext/lb_policy/round_robin/round_robin.c
@@ -130,10 +130,6 @@ struct round_robin_lb_policy {
 
   /** total number of addresses received at creation time */
   size_t num_addresses;
-  /** array holding the borrowed and opaque pointers to incoming user data, one
-   * per incoming address.  These individual pointers will be returned as-is in
-   * successful picks. */
-  void **user_data_pointers;
 
   /** all our subchannels */
   size_t num_subchannels;
@@ -282,7 +278,6 @@ static void rr_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
     elem = tmp;
   }
 
-  gpr_free(p->user_data_pointers);
   gpr_free(p);
 }
 
@@ -626,8 +621,6 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
   p->num_addresses = num_addrs;
   p->subchannels = gpr_malloc(sizeof(*p->subchannels) * num_addrs);
   memset(p->subchannels, 0, sizeof(*p->subchannels) * num_addrs);
-  p->user_data_pointers = gpr_malloc(sizeof(void *) * num_addrs);
-  memset(p->user_data_pointers, 0, sizeof(void *) * num_addrs);
 
   grpc_subchannel_args sc_args;
   size_t subchannel_idx = 0;
@@ -650,9 +643,7 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
       sd->policy = p;
       sd->index = subchannel_idx;
       sd->subchannel = subchannel;
-      sd->user_data = p->user_data_pointers[i];
-      p->user_data_pointers[subchannel_idx] =
-          args->addresses->addresses[i].user_data;
+      sd->user_data = args->addresses->addresses[i].user_data;
       ++subchannel_idx;
       grpc_closure_init(&sd->connectivity_changed_closure,
                         rr_connectivity_changed, sd);
@@ -661,7 +652,6 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
   if (subchannel_idx == 0) {
     /* couldn't create any subchannel. Bail out */
     gpr_free(p->subchannels);
-    gpr_free(p->user_data_pointers);
     gpr_free(p);
     return NULL;
   }
diff --git a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c
index 307e0698f9..fbfe5d774b 100644
--- a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c
+++ b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c
@@ -129,7 +129,6 @@ static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
     lb_policy_args.client_channel_factory = r->client_channel_factory;
     grpc_lb_policy *lb_policy =
         grpc_lb_policy_create(exec_ctx, r->lb_policy_name, &lb_policy_args);
-    gpr_free(lb_policy_args.addresses);
     grpc_resolver_result_set_lb_policy(result, lb_policy);
     GRPC_LB_POLICY_UNREF(exec_ctx, lb_policy, "sockaddr");
     r->published = true;
-- 
cgit v1.2.3


From 7ce14d2a008d0df70ec0a43235728f4d5781ee36 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Fri, 16 Sep 2016 13:03:46 -0700
Subject: Code review changes.

---
 src/core/ext/client_config/lb_policy_factory.c | 3 ++-
 src/core/ext/lb_policy/grpclb/grpclb.c         | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/core/ext/lb_policy/grpclb/grpclb.c')

diff --git a/src/core/ext/client_config/lb_policy_factory.c b/src/core/ext/client_config/lb_policy_factory.c
index e5e416ced9..f86117aa38 100644
--- a/src/core/ext/client_config/lb_policy_factory.c
+++ b/src/core/ext/client_config/lb_policy_factory.c
@@ -63,8 +63,9 @@ void grpc_lb_addresses_destroy(grpc_lb_addresses* addresses,
                                void (*user_data_destroy)(void*)) {
   for (size_t i = 0; i < addresses->num_addresses; ++i) {
     gpr_free(addresses->addresses[i].balancer_name);
-    if (user_data_destroy != NULL)
+    if (user_data_destroy != NULL) {
       user_data_destroy(addresses->addresses[i].user_data);
+    }
   }
   gpr_free(addresses->addresses);
   gpr_free(addresses);
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c
index 999122fbe0..36db8ab00d 100644
--- a/src/core/ext/lb_policy/grpclb/grpclb.c
+++ b/src/core/ext/lb_policy/grpclb/grpclb.c
@@ -354,8 +354,7 @@ static bool is_server_valid(const grpc_grpclb_server *server, size_t idx,
   return true;
 }
 
-/* populate \a addresses according to \a serverlist. Returns the number of
- * addresses successfully parsed and added to \a addresses */
+/* Returns addresses extracted from \a serverlist. */
 static grpc_lb_addresses *process_serverlist(
     const grpc_grpclb_serverlist *serverlist) {
   size_t num_valid = 0;
-- 
cgit v1.2.3