commit a14215a67841ea7920260c655c01e4570595a3db
author Craig Tiller <ctiller@google.com> Fri Jul 17 17:21:08 2015 -0700
committer Craig Tiller <ctiller@google.com> Fri Jul 17 17:21:08 2015 -0700
tree 395d1935dc3085c191dc00270550b66cd39378fc
parent cf9a9334f56119d74a4b700f4ace6d8555ffb5fa

Fix state tracking, refcounting, overflow bugs

src/core/client_config/lb_policies/pick_first.c

diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c
index 8409aab..1a0f9d1 100644
--- a/src/core/client_config/lb_policies/pick_first.c
+++ b/src/core/client_config/lb_policies/pick_first.c
@@ -62,6 +62,8 @@
   grpc_subchannel *selected;
   /** have we started picking? */
   int started_picking;
+  /** are we shut down? */
+  int shutdown;
   /** which subchannel are we watching? */
   size_t checking_subchannel;
   /** what is the connectivity of that channel? */
@@ -107,12 +109,14 @@
   pending_pick *pp;
   gpr_mu_lock(&p->mu);
   del_interested_parties_locked(p);
+  p->shutdown = 1;
   while ((pp = p->pending_picks)) {
     p->pending_picks = pp->next;
     *pp->target = NULL;
     grpc_iomgr_add_delayed_callback(pp->on_complete, 0);
     gpr_free(pp);
   }
+  grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE);
   gpr_mu_unlock(&p->mu);
 }
 
@@ -168,7 +172,9 @@
 
   gpr_mu_lock(&p->mu);
 
-  if (p->selected != NULL) {
+  if (p->shutdown) {
+    unref = 1;
+  } else if (p->selected != NULL) {
     grpc_connectivity_state_set(&p->state_tracker, p->checking_connectivity);
     if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) {
       grpc_subchannel_notify_on_state_change(p->selected, &p->checking_connectivity, &p->connectivity_changed);