nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 04:56:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small changes to scheduler comments and state changes

Browse Source 
Tries to make some of the comments in scheduler.c easier to follow,
and simplifies a couple of the scheduler channel state changes.
This commit is contained in:
Steven Engler 2020-02-17 11:38:00 -05:00 committed by David Goulet
parent f231827946
commit 9a68eca3a7
3 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket33349 Normal file
View File

@ -0,0 +1,4 @@
o Code simplification and refactoring:
- Updated comments in 'scheduler.c' to reflect old code changes,
and simplified the scheduler channel state change code. Closes
ticket 33349.

69
src/core/or/scheduler.c
View File

@ -502,7 +502,12 @@ scheduler_free_all(void)
the_scheduler = NULL;
}
/** Mark a channel as no longer ready to accept writes. */
/** Mark a channel as no longer ready to accept writes.
*
* Possible state changes:
* - SCHED_CHAN_PENDING -> SCHED_CHAN_WAITING_TO_WRITE
* - SCHED_CHAN_WAITING_FOR_CELLS -> SCHED_CHAN_IDLE
*/
MOCK_IMPL(void,
scheduler_channel_doesnt_want_writes,(channel_t *chan))
{
@ -513,31 +518,32 @@ scheduler_channel_doesnt_want_writes,(channel_t *chan))
return;
}
/* If it's already in pending, we can put it in waiting_to_write */
if (chan->scheduler_state == SCHED_CHAN_PENDING) {
/*
* It's in channels_pending, so it shouldn't be in any of
* the other lists. It can't write any more, so it goes to
* channels_waiting_to_write.
* It has cells but no longer can write, so it becomes
* SCHED_CHAN_WAITING_TO_WRITE. It's in channels_pending, so we
* should remove it from the list.
*/
smartlist_pqueue_remove(channels_pending,
scheduler_compare_channels,
offsetof(channel_t, sched_heap_idx),
chan);
scheduler_set_channel_state(chan, SCHED_CHAN_WAITING_TO_WRITE);
} else {
} else if (chan->scheduler_state == SCHED_CHAN_WAITING_FOR_CELLS) {
/*
* It's not in pending, so it can't become waiting_to_write; it's
* either not in any of the lists (nothing to do) or it's already in
* waiting_for_cells (remove it, can't write any more).
* It does not have cells and no longer can write, so it becomes
* SCHED_CHAN_IDLE.
*/
if (chan->scheduler_state == SCHED_CHAN_WAITING_FOR_CELLS) {
scheduler_set_channel_state(chan, SCHED_CHAN_IDLE);
}
}
}
/** Mark a channel as having waiting cells. */
/** Mark a channel as having waiting cells.
*
* Possible state changes:
* - SCHED_CHAN_WAITING_FOR_CELLS -> SCHED_CHAN_PENDING
* - SCHED_CHAN_IDLE -> SCHED_CHAN_WAITING_TO_WRITE
*/
MOCK_IMPL(void,
scheduler_channel_has_waiting_cells,(channel_t *chan))
{
@ -548,12 +554,11 @@ scheduler_channel_has_waiting_cells,(channel_t *chan))
return;
}
/* First, check if it's also writeable */
if (chan->scheduler_state == SCHED_CHAN_WAITING_FOR_CELLS) {
/*
* It's in channels_waiting_for_cells, so it shouldn't be in any of
* the other lists. It has waiting cells now, so it goes to
* channels_pending.
* It is able to write and now has cells, so it becomes
* SCHED_CHAN_PENDING. It must be added to the channels_pending
* list.
*/
scheduler_set_channel_state(chan, SCHED_CHAN_PENDING);
if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) {
@ -565,17 +570,13 @@ scheduler_channel_has_waiting_cells,(channel_t *chan))
/* If we made a channel pending, we potentially have scheduling work to
* do. */
the_scheduler->schedule();
} else {
} else if (chan->scheduler_state == SCHED_CHAN_IDLE) {
/*
* It's not in waiting_for_cells, so it can't become pending; it's
* either not in any of the lists (we add it to waiting_to_write)
* or it's already in waiting_to_write or pending (we do nothing)
* It is not able to write but now has cells, so it becomes
* SCHED_CHAN_WAITING_TO_WRITE.
*/
if (!(chan->scheduler_state == SCHED_CHAN_WAITING_TO_WRITE ||
chan->scheduler_state == SCHED_CHAN_PENDING)) {
scheduler_set_channel_state(chan, SCHED_CHAN_WAITING_TO_WRITE);
}
}
}
/** Add the scheduler event to the set of pending events with next_run being
@ -662,8 +663,12 @@ scheduler_release_channel,(channel_t *chan))
scheduler_set_channel_state(chan, SCHED_CHAN_IDLE);
}
/** Mark a channel as ready to accept writes */
/** Mark a channel as ready to accept writes.
* Possible state changes:
*
* - SCHED_CHAN_WAITING_TO_WRITE -> SCHED_CHAN_PENDING
* - SCHED_CHAN_IDLE -> SCHED_CHAN_WAITING_FOR_CELLS
*/
void
scheduler_channel_wants_writes(channel_t *chan)
{
@ -674,10 +679,11 @@ scheduler_channel_wants_writes(channel_t *chan)
return;
}
/* If it's already in waiting_to_write, we can put it in pending */
if (chan->scheduler_state == SCHED_CHAN_WAITING_TO_WRITE) {
/*
* It can write now, so it goes to channels_pending.
* It has cells and can now write, so it becomes
* SCHED_CHAN_PENDING. It must be added to the channels_pending
* list.
*/
scheduler_set_channel_state(chan, SCHED_CHAN_PENDING);
if (!SCHED_BUG(chan->sched_heap_idx != -1, chan)) {
@ -688,16 +694,13 @@ scheduler_channel_wants_writes(channel_t *chan)
}
/* We just made a channel pending, we have scheduling work to do. */
the_scheduler->schedule();
} else {
} else if (chan->scheduler_state == SCHED_CHAN_IDLE) {
/*
* It's not in SCHED_CHAN_WAITING_TO_WRITE, so it can't become pending;
* it's either idle and goes to WAITING_FOR_CELLS, or it's a no-op.
* It does not have cells but can now write, so it becomes
* SCHED_CHAN_WAITING_FOR_CELLS.
*/
if (!(chan->scheduler_state == SCHED_CHAN_WAITING_FOR_CELLS ||
chan->scheduler_state == SCHED_CHAN_PENDING)) {
scheduler_set_channel_state(chan, SCHED_CHAN_WAITING_FOR_CELLS);
}
}
}
/* Log warn the given channel and extra scheduler context as well. This is

7
src/core/or/scheduler_kist.c
View File

@ -463,6 +463,13 @@ MOCK_IMPL(void, channel_write_to_kernel, (channel_t *chan))
log_debug(LD_SCHED, "Writing %lu bytes to kernel for chan %" PRIu64,
(unsigned long)channel_outbuf_length(chan),
chan->global_identifier);
/* Note that 'connection_handle_write()' may change the scheduler state of
* the channel during the scheduling loop with
* 'connection_or_flushed_some()' -> 'scheduler_channel_wants_writes()'.
* This side-effect will only occur if the channel is currently in the
* 'SCHED_CHAN_WAITING_TO_WRITE' or 'SCHED_CHAN_IDLE' states, which KIST
* rarely uses, so it should be fine unless KIST begins using these states
* in the future. */
connection_handle_write(TO_CONN(BASE_CHAN_TO_TLS(chan)->conn), 0);
}