aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-06-24 19:32:51 +0200
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-06-24 19:32:51 +0200
commit3857d233f4b6a6abf0c8a287296be036127ab3df (patch)
tree576f4798b48f9c2b290dfe0f56fd68ab459de0c5
parentd9145d91f542e838827dfdd83978586e2686973f (diff)
Let's inform the system of the lock to unlock...
Fixes #2190. In grpc_pollset_work we need to pass down which lock to unlock before actually doing something.
-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 d0507af960..495627ee0a 100644
--- a/src/core/iomgr/pollset_windows.c
+++ b/src/core/iomgr/pollset_windows.c
@@ -68,10 +68,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);