diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-07-06 13:11:09 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-07-06 13:11:09 -0700 |
| commit | 7212c233e84f199742bb98176eef9f8d15ccaabb (patch) | |
| tree | 7ce1d513cacae0947d42b1a5a3e561fbca9d7a82 /src/core/lib/iomgr | |
| parent | f83f8ca443778dc00b47b6364053970b30df83f9 (diff) | |
Fix mutex loop
Diffstat (limited to 'src/core/lib/iomgr')
| -rw-r--r-- | src/core/lib/iomgr/ev_epoll_linux.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/lib/iomgr/ev_epoll_linux.c b/src/core/lib/iomgr/ev_epoll_linux.c index 0c42d6e99a..30f03c17bc 100644 --- a/src/core/lib/iomgr/ev_epoll_linux.c +++ b/src/core/lib/iomgr/ev_epoll_linux.c @@ -1533,6 +1533,7 @@ static void pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, polling_island *pi_new = NULL; +retry: /* 1) If fd->polling_island and pollset->polling_island are both non-NULL and * equal, do nothing. * 2) If fd->polling_island and pollset->polling_island are both NULL, create @@ -1550,7 +1551,12 @@ static void pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, if (fd->polling_island == pollset->polling_island) { pi_new = fd->polling_island; if (pi_new == NULL) { + gpr_mu_unlock(&fd->mu); pi_new = polling_island_create(exec_ctx, fd, &error); + gpr_mu_lock(&fd->mu); + if (fd->polling_island != NULL) { + goto retry; + } GRPC_POLLING_TRACE( "pollset_add_fd: Created new polling island. pi_new: %p (fd: %d, " |