aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-06-24 15:36:45 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-06-24 15:36:45 -0700
commitaff63409063221b233d0ffddaf157c7185ddc25e (patch)
treefc105c918bec4d1360f62e806a45cb11e219321f /src
parentdbf624a8073cdfff0a4f9f4e3327cfd6ea3833d5 (diff)
parent3857d233f4b6a6abf0c8a287296be036127ab3df (diff)
Merge pull request #2202 from nicolasnoble/don-t-recursive-lock-me
Let's inform the system of the lock to unlock...
Diffstat (limited to 'src')
-rw-r--r--src/core/iomgr/pollset_windows.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c
index 1f750f6d39..926ee8fdd9 100644
--- a/src/core/iomgr/pollset_windows.c
+++ b/src/core/iomgr/pollset_windows.c
@@ -70,10 +70,10 @@ int grpc_pollset_work(grpc_pollset *pollset, gpr_timespec deadline) {
if (gpr_time_cmp(now, deadline) > 0) {
return 0 /* GPR_FALSE */;
}
- if (grpc_maybe_call_delayed_callbacks(NULL, 1 /* GPR_TRUE */)) {
+ if (grpc_maybe_call_delayed_callbacks(&pollset->mu, 1 /* GPR_TRUE */)) {
return 1 /* GPR_TRUE */;
}
- if (grpc_alarm_check(NULL, now, &deadline)) {
+ if (grpc_alarm_check(&pollset->mu, now, &deadline)) {
return 1 /* GPR_TRUE */;
}
gpr_cv_wait(&pollset->cv, &pollset->mu, deadline);