diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-16 16:36:15 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-02-16 16:36:15 -0800 |
| commit | 9596d6b1120ab3a53cbbecfbb15b8551dff5902b (patch) | |
| tree | f94ec5c4b682fb3518dba81eccebb0fc58d03eb6 /src/core/lib/iomgr/ev_epoll_linux.c | |
| parent | 69c0437e7558795a2badb6b7ca5222820d2f098f (diff) | |
| parent | 9e5ac1bf115a182c0418f21d60d15245af6307bf (diff) | |
Merge pull request #9660 from ctiller/c3
Convert client_channel.c to use a combiner lock
Diffstat (limited to 'src/core/lib/iomgr/ev_epoll_linux.c')
| -rw-r--r-- | src/core/lib/iomgr/ev_epoll_linux.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/ev_epoll_linux.c b/src/core/lib/iomgr/ev_epoll_linux.c index fc56843128..fac3705142 100644 --- a/src/core/lib/iomgr/ev_epoll_linux.c +++ b/src/core/lib/iomgr/ev_epoll_linux.c @@ -1842,13 +1842,12 @@ static grpc_pollset_set *pollset_set_create(void) { return pss; } -static void pollset_set_destroy(grpc_pollset_set *pss) { +static void pollset_set_destroy(grpc_exec_ctx *exec_ctx, + grpc_pollset_set *pss) { gpr_mu_destroy(&pss->po.mu); if (pss->po.pi != NULL) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - PI_UNREF(&exec_ctx, pss->po.pi, "pss_destroy"); - grpc_exec_ctx_finish(&exec_ctx); + PI_UNREF(exec_ctx, pss->po.pi, "pss_destroy"); } gpr_free(pss); |