diff options
| author | David Goulet <dgoulet@torproject.org> | 2018-02-01 16:39:04 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-02-01 16:39:04 -0500 |
| commit | e1a40535eaac0cd7306770660da798a0ee247549 (patch) | |
| tree | baf0f58eb0ad0d73addfc980ba182bc758aa7f85 /src/or/scheduler.c | |
| parent | 5516d22a26648f2f3c05324a854cf573b4b5e39c (diff) | |
| parent | cb5654f300312a8f4c777378d68696667eff427b (diff) | |
| download | tor-e1a40535eaac0cd7306770660da798a0ee247549.tar.gz tor-e1a40535eaac0cd7306770660da798a0ee247549.zip | |
Merge branch 'bug24700_032_01' into bug24700_033_01
Diffstat (limited to 'src/or/scheduler.c')
| -rw-r--r-- | src/or/scheduler.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 749df5a248..931122f8d6 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -560,10 +560,12 @@ scheduler_channel_has_waiting_cells,(channel_t *chan)) * channels_pending. */ scheduler_set_channel_state(chan, SCHED_CHAN_PENDING); - smartlist_pqueue_add(channels_pending, - scheduler_compare_channels, - offsetof(channel_t, sched_heap_idx), - chan); + if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) { + smartlist_pqueue_add(channels_pending, + scheduler_compare_channels, + offsetof(channel_t, sched_heap_idx), + chan); + } /* If we made a channel pending, we potentially have scheduling work to * do. */ the_scheduler->schedule(); @@ -678,11 +680,13 @@ scheduler_channel_wants_writes(channel_t *chan) /* * It can write now, so it goes to channels_pending. */ - smartlist_pqueue_add(channels_pending, - scheduler_compare_channels, - offsetof(channel_t, sched_heap_idx), - chan); scheduler_set_channel_state(chan, SCHED_CHAN_PENDING); + if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) { + smartlist_pqueue_add(channels_pending, + scheduler_compare_channels, + offsetof(channel_t, sched_heap_idx), + chan); + } /* We just made a channel pending, we have scheduling work to do. */ the_scheduler->schedule(); } else { |