commit dcfe504a99a621c9f9c32c12dd8ae3f22fdb0e95
author jboeuf <jboeuf@users.noreply.github.com> Mon Apr 13 16:17:35 2015 -0700
committer jboeuf <jboeuf@users.noreply.github.com> Mon Apr 13 16:17:35 2015 -0700
tree bf8e8a4345b4249f8fdaa78ba2b59608bd8d337c
parent 30461a9131556a25a2a456eac8d1f78064f0ed06
parent 954d7a26867f57bd44ebcaba3677e93332abc804

Merge pull request #1269 from ctiller/racefix

Fix race on shutdown

src/core/iomgr/tcp_server_posix.c

diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c
index 895f85f..7e31f2d 100644
--- a/src/core/iomgr/tcp_server_posix.c
+++ b/src/core/iomgr/tcp_server_posix.c
@@ -174,7 +174,6 @@
   while (s->active_ports) {
     gpr_cv_wait(&s->cv, &s->mu, gpr_inf_future);
   }
-  gpr_mu_unlock(&s->mu);
 
   /* delete ALL the things */
   if (s->nports) {
@@ -185,7 +184,9 @@
       }
       grpc_fd_orphan(sp->emfd, destroyed_port, s);
     }
+    gpr_mu_unlock(&s->mu);
   } else {
+    gpr_mu_unlock(&s->mu);
     finish_shutdown(s);
   }
 }