diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-08-28 12:53:57 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-08-28 12:53:57 -0700 |
| commit | 4b5b019d5644affef122e06c6898811286850b8d (patch) | |
| tree | 73c601dc31c436e3d800a846d08b9ace7ff05235 /src/core/lib/iomgr/ev_epollex_linux.cc | |
| parent | b8f030bc0b507903e9d156fb44d161015273d0c6 (diff) | |
| parent | ee65a5eaee45a765d1d4176a797bb8288faeb180 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz-subchannels
Diffstat (limited to 'src/core/lib/iomgr/ev_epollex_linux.cc')
| -rw-r--r-- | src/core/lib/iomgr/ev_epollex_linux.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index 96eae30345..b082634af1 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -46,6 +46,7 @@ #include "src/core/lib/gpr/tls.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/manual_constructor.h" +#include "src/core/lib/gprpp/mutex_lock.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/is_epollexclusive_available.h" @@ -735,7 +736,7 @@ static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) { static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) { GPR_TIMER_SCOPE("kick_one_worker", 0); pollable* p = specific_worker->pollable_obj; - grpc_core::mu_guard lock(&p->mu); + grpc_core::MutexLock lock(&p->mu); GPR_ASSERT(specific_worker != nullptr); if (specific_worker->kicked) { if (grpc_polling_trace.enabled()) { |