diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-31 18:28:12 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-31 18:28:12 +0000 |
| commit | 333a9a9178e8d39092d115acb1a4ae0485d37391 (patch) | |
| tree | 94f9fa6cc5c2b9d44bbf22712306d8709b529503 | |
| parent | 54f8d9835c7ccef56113f8d36f0a68de51dd7174 (diff) | |
| parent | 2a505cbe633b30afd7b10d655e000617b4a4ede9 (diff) | |
Merge branch 'faster_timer_pool' into ALL-the-things
| -rw-r--r-- | src/core/lib/iomgr/timer_manager.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/timer_manager.c b/src/core/lib/iomgr/timer_manager.c index 767bb64961..5fb3102f38 100644 --- a/src/core/lib/iomgr/timer_manager.c +++ b/src/core/lib/iomgr/timer_manager.c @@ -143,7 +143,10 @@ static bool wait_until(gpr_timespec next) { const gpr_timespec inf_future = gpr_inf_future(GPR_CLOCK_MONOTONIC); gpr_mu_lock(&g_mu); // if we're not threaded anymore, leave - if (!g_threaded) return false; + if (!g_threaded) { + gpr_mu_unlock(&g_mu); + return false; + } // if there's no timed waiter, we should become one: that waiter waits // only until the next timer should expire // all other timers wait forever |