Skip to content
Snippets Groups Projects
Commit aff63409 authored by Craig Tiller's avatar Craig Tiller
Browse files

Merge pull request #2202 from nicolasnoble/don-t-recursive-lock-me

Let's inform the system of the lock to unlock...
parents dbf624a8 3857d233
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment