diff options
| author |  yang-g <yangg@google.com> | 2017-03-23 16:29:01 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2017-03-23 16:29:01 -0700 |
| commit | 8fc385a3d2132ef2035d18d08598666291915e0a (patch) | |
| tree | 6cc05dee780a7a20a3a235562a235a0a9051a4eb /src/core/lib/iomgr | |
| parent | 6f1e443a519cd28d97be78c5ca2ca72a45f6b598 (diff) | |
Prevent cleaning up the fd twice.
Diffstat (limited to 'src/core/lib/iomgr')
| -rw-r--r-- | src/core/lib/iomgr/udp_server.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/lib/iomgr/udp_server.c b/src/core/lib/iomgr/udp_server.c index 28f2bd9359..95013cb6fb 100644 --- a/src/core/lib/iomgr/udp_server.c +++ b/src/core/lib/iomgr/udp_server.c @@ -162,10 +162,7 @@ static void deactivated_all_ports(grpc_exec_ctx *exec_ctx, grpc_udp_server *s) { /* delete ALL the things */ gpr_mu_lock(&s->mu); - if (!s->shutdown) { - gpr_mu_unlock(&s->mu); - return; - } + GPR_ASSERT(s->shutdown); if (s->head) { grpc_udp_listener *sp; @@ -288,7 +285,7 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { gpr_mu_lock(&sp->server->mu); if (error != GRPC_ERROR_NONE) { - if (0 == --sp->server->active_ports) { + if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); deactivated_all_ports(exec_ctx, sp->server); } else { @@ -311,7 +308,7 @@ static void on_write(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { gpr_mu_lock(&(sp->server->mu)); if (error != GRPC_ERROR_NONE) { - if (0 == --sp->server->active_ports) { + if (0 == --sp->server->active_ports && sp->server->shutdown) { gpr_mu_unlock(&sp->server->mu); deactivated_all_ports(exec_ctx, sp->server); } else { |