aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-02-04 22:47:18 -0800
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-02-04 22:47:18 -0800
commit5200c1891489b8616b8267d1de89ef0ef7c73b44 (patch)
tree65416fcfc9d0ecb58e9d8bfc07101811568e65e1 /src/core
parent3dd8c2e53daa13ecc165fb5f2d32f47d34d61f18 (diff)
Go one further.
There's no need for this branch at all.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/iomgr/alarm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c
index cab7c17d80..7884b21a1e 100644
--- a/src/core/iomgr/alarm.c
+++ b/src/core/iomgr/alarm.c
@@ -335,9 +335,6 @@ static int run_some_expired_alarms(gpr_mu *drop_mu, gpr_timespec now,
gpr_mu_unlock(&g_mu);
gpr_mu_unlock(&g_checker_mu);
- } else if (next && gpr_mu_trylock(&g_mu)) {
- *next = gpr_time_min(*next, g_shard_queue[0]->min_deadline);
- gpr_mu_unlock(&g_mu);
}
if (n && drop_mu) {