diff options
author | 2015-08-18 12:51:05 -0700 | |
---|---|---|
committer | 2015-08-18 12:51:05 -0700 | |
commit | 128f4a9cfe34825543dab4e29c875b59af40e666 (patch) | |
tree | 323e79e6d7dd98ef6aa23f93ec20736d10abd9ce /src/core/iomgr/alarm.c | |
parent | f2066040d2568e6ae90f6690fab91c63cd17fd6b (diff) | |
parent | 4f21d3549c8f652a152ae086a74dd8415ecca8fa (diff) |
Merge github.com:grpc/grpc into y12kdm3
Diffstat (limited to 'src/core/iomgr/alarm.c')
-rw-r--r-- | src/core/iomgr/alarm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/iomgr/alarm.c b/src/core/iomgr/alarm.c index 68d33b9cf6..ddb30dc4bb 100644 --- a/src/core/iomgr/alarm.c +++ b/src/core/iomgr/alarm.c @@ -105,8 +105,7 @@ void grpc_alarm_list_init(gpr_timespec now) { void grpc_alarm_list_shutdown(void) { int i; - while (run_some_expired_alarms(NULL, gpr_inf_future(g_clock_type), NULL, - 0)) + while (run_some_expired_alarms(NULL, gpr_inf_future(g_clock_type), NULL, 0)) ; for (i = 0; i < NUM_SHARDS; i++) { shard_type *shard = &g_shards[i]; @@ -362,7 +361,7 @@ static int run_some_expired_alarms(gpr_mu *drop_mu, gpr_timespec now, int grpc_alarm_check(gpr_mu *drop_mu, gpr_timespec now, gpr_timespec *next) { GPR_ASSERT(now.clock_type == g_clock_type); return run_some_expired_alarms( - drop_mu, now, next, + drop_mu, now, next, gpr_time_cmp(now, gpr_inf_future(now.clock_type)) != 0); } |