diff options
author | Andrea Shepard <andrea@torproject.org> | 2013-12-12 04:29:45 -0800 |
---|---|---|
committer | Andrea Shepard <andrea@torproject.org> | 2014-09-30 22:49:58 -0700 |
commit | ac1b627e85a41bb734ab22bef268a5145cf83f15 (patch) | |
tree | d1603597628f0c8982a04ba58cd7d412c504b377 /src/or | |
parent | ed1927d6bf8b9d60d40f6fbc20f9e1575a35e59d (diff) | |
download | tor-ac1b627e85a41bb734ab22bef268a5145cf83f15.tar.gz tor-ac1b627e85a41bb734ab22bef268a5145cf83f15.zip |
Implement scheduler_touch_channel()
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/scheduler.c | 24 | ||||
-rw-r--r-- | src/or/scheduler.h | 3 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 4f12696c68..140ff2fef1 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -580,6 +580,30 @@ scheduler_channel_wants_writes(channel_t *chan) } /** + * Notify the scheduler that a channel's position in the pqueue may have + * changed + */ + +void +scheduler_touch_channel(channel_t *chan) +{ + tor_assert(chan); + + if (chan->scheduler_state == SCHED_CHAN_PENDING) { + /* Remove and re-add it */ + smartlist_pqueue_remove(channels_pending, + scheduler_compare_channels, + STRUCT_OFFSET(channel_t, sched_heap_idx), + chan); + smartlist_pqueue_add(channels_pending, + scheduler_compare_channels, + STRUCT_OFFSET(channel_t, sched_heap_idx), + chan); + } + /* else no-op, since it isn't in the queue */ +} + +/** * Notify the scheduler of a queue size adjustment, to recalculate the * queue heuristic. */ diff --git a/src/or/scheduler.h b/src/or/scheduler.h index 8fe59cb0b3..e2d2eb5192 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -30,5 +30,8 @@ void scheduler_release_channel(channel_t *chan); /* Notify scheduler of queue size adjustments */ void scheduler_adjust_queue_size(channel_t *chan, char dir, uint64_t adj); +/* Notify scheduler that a channel's queue position may have changed */ +void scheduler_touch_channel(channel_t *chan); + #endif /* !defined(TOR_SCHEDULER_H) */ |