diff options
| author |  yang-g <yangg@google.com> | 2016-02-12 14:54:16 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-02-12 14:54:16 -0800 |
| commit | a3c968d9c263b7e380f524bcb27195a76ff3d4b7 (patch) | |
| tree | 23907ff5633e431a4497d8ddffe035941bba263c /src/core/iomgr/pollset_windows.c | |
| parent | 1945ae42854689afa398e46d3086e55706fee655 (diff) | |
| parent | 017f84ead8fe1709ecd9a9f7f532464d2a170ff9 (diff) | |
Merge remote-tracking branch 'upstream/master' into inherit_from_grpc_library
Diffstat (limited to 'src/core/iomgr/pollset_windows.c')
| -rw-r--r-- | src/core/iomgr/pollset_windows.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c index 2e650ca939..02c6678363 100644 --- a/src/core/iomgr/pollset_windows.c +++ b/src/core/iomgr/pollset_windows.c @@ -212,10 +212,8 @@ void grpc_pollset_kick(grpc_pollset *p, grpc_pollset_worker *specific_worker) { grpc_iocp_kick(); } } else { - if (p->is_iocp_worker) { - if (g_active_poller == specific_worker) { - grpc_iocp_kick(); - } + if (p->is_iocp_worker && g_active_poller == specific_worker) { + grpc_iocp_kick(); } else { specific_worker->kicked = 1; gpr_cv_signal(&specific_worker->cv); |