diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-06-07 13:00:14 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-06-07 13:00:14 -0700 |
| commit | c97065da86ea140a86815575ce0f22d1ef45d576 (patch) | |
| tree | 83686125dd2f3eaf055f5bb7e977222f22d14dfd /src/core/lib/iomgr/timer.c | |
| parent | 2888bd58b00b30429470652b05bc2076785e8a99 (diff) | |
| parent | d30d4e279c4a63effaa6e912fc00bd4ad96054c7 (diff) | |
Merge github.com:grpc/grpc into error
Diffstat (limited to 'src/core/lib/iomgr/timer.c')
| -rw-r--r-- | src/core/lib/iomgr/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/timer.c b/src/core/lib/iomgr/timer.c index 7b0ef550a7..b25267f538 100644 --- a/src/core/lib/iomgr/timer.c +++ b/src/core/lib/iomgr/timer.c @@ -287,7 +287,8 @@ static int refill_queue(shard_type *shard, gpr_timespec now) { return !grpc_timer_heap_is_empty(&shard->heap); } -/* This pops the next non-cancelled timer with deadline <= now from the queue, +/* This pollent the next non-cancelled timer with deadline <= now from the + queue, or returns NULL if there isn't one. REQUIRES: shard->mu locked */ static grpc_timer *pop_one(shard_type *shard, gpr_timespec now) { |