diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-02-05 11:42:58 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-02-05 11:42:58 -0800 |
| commit | 86d9159356d5d23981f122c3bd4ad912203666ca (patch) | |
| tree | 1cf0b4622ada6275370277a748438102e44188f4 /src/core/iomgr/alarm.c | |
| parent | 24fc2c4c5ddc56a678f17170ac4eec4ec570c780 (diff) | |
| parent | 6b9afb153a82c921c7e80365a4e129c462c0ebad (diff) | |
Merge github.com:google/grpc into async-api-new
Diffstat (limited to 'src/core/iomgr/alarm.c')
| -rw-r--r-- | src/core/iomgr/alarm.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index 5b80368e3a..7884b21a1e 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -335,10 +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_lock(&g_mu); - *next = gpr_time_min(*next, g_shard_queue[0]->min_deadline); - gpr_mu_unlock(&g_mu); } if (n && drop_mu) { |