diff options
author | 2015-07-31 11:48:34 -0700 | |
---|---|---|
committer | 2015-07-31 11:48:34 -0700 | |
commit | 11af9747152565c4f5bfe0acb453715521e8af7f (patch) | |
tree | dfd8a611328609b5347dec539d571e06401125c2 /src/core/iomgr/tcp_server_posix.c | |
parent | 5f8d05bb9c72d950ca35e27a8da8a303765c85cb (diff) | |
parent | 86d1f1325ddfd5824ec988a899006c38016ca3cb (diff) |
Merge pull request #2726 from ctiller/insolent-pork-chop
Fix Ruby segfaults and TSAN reported races
Diffstat (limited to 'src/core/iomgr/tcp_server_posix.c')
-rw-r--r-- | src/core/iomgr/tcp_server_posix.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 8538600112..6399aaadb9 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -142,6 +142,7 @@ grpc_tcp_server *grpc_tcp_server_create(void) { static void finish_shutdown(grpc_tcp_server *s) { s->shutdown_complete(s->shutdown_complete_arg); + s->shutdown_complete = NULL; gpr_mu_destroy(&s->mu); @@ -157,6 +158,7 @@ static void destroyed_port(void *server, int success) { gpr_mu_unlock(&s->mu); finish_shutdown(s); } else { + GPR_ASSERT(s->destroyed_ports < s->nports); gpr_mu_unlock(&s->mu); } } |