commit 8797c8fbd34132f462be4a4544270ee1b8a071cf Author: Matt Traudt sirmatt@ksu.edu Date: Mon Dec 11 09:20:54 2017 -0500
Remove now-duplicate log_debug lines --- src/or/scheduler.c | 23 ----------------------- src/or/scheduler_kist.c | 6 ------ src/or/scheduler_vanilla.c | 20 -------------------- 3 files changed, 49 deletions(-)
diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 42d9c9f08..1b6d160b8 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -528,10 +528,6 @@ scheduler_channel_doesnt_want_writes,(channel_t *chan)) offsetof(channel_t, sched_heap_idx), chan); scheduler_set_channel_state(chan, SCHED_CHAN_WAITING_TO_WRITE); - log_debug(LD_SCHED, - "Channel " U64_FORMAT " at %p went from pending " - "to waiting_to_write", - U64_PRINTF_ARG(chan->global_identifier), chan); } else { /* * It's not in pending, so it can't become waiting_to_write; it's @@ -540,9 +536,6 @@ scheduler_channel_doesnt_want_writes,(channel_t *chan)) */ if (chan->scheduler_state == SCHED_CHAN_WAITING_FOR_CELLS) { scheduler_set_channel_state(chan, SCHED_CHAN_IDLE); - log_debug(LD_SCHED, - "Channel " U64_FORMAT " at %p left waiting_for_cells", - U64_PRINTF_ARG(chan->global_identifier), chan); } } } @@ -570,10 +563,6 @@ scheduler_channel_has_waiting_cells,(channel_t *chan)) scheduler_compare_channels, offsetof(channel_t, sched_heap_idx), chan); - log_debug(LD_SCHED, - "Channel " U64_FORMAT " at %p went from waiting_for_cells " - "to pending", - U64_PRINTF_ARG(chan->global_identifier), chan); /* If we made a channel pending, we potentially have scheduling work to * do. */ the_scheduler->schedule(); @@ -586,9 +575,6 @@ scheduler_channel_has_waiting_cells,(channel_t *chan)) 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); - log_debug(LD_SCHED, - "Channel " U64_FORMAT " at %p entered waiting_to_write", - U64_PRINTF_ARG(chan->global_identifier), chan); } } } @@ -691,17 +677,11 @@ scheduler_channel_wants_writes(channel_t *chan) /* * It can write now, so it goes to channels_pending. */ - log_debug(LD_SCHED, "chan=%" PRIu64 " became pending", - chan->global_identifier); smartlist_pqueue_add(channels_pending, scheduler_compare_channels, offsetof(channel_t, sched_heap_idx), chan); scheduler_set_channel_state(chan, SCHED_CHAN_PENDING); - log_debug(LD_SCHED, - "Channel " U64_FORMAT " at %p went from waiting_to_write " - "to pending", - U64_PRINTF_ARG(chan->global_identifier), chan); /* We just made a channel pending, we have scheduling work to do. */ the_scheduler->schedule(); } else { @@ -712,9 +692,6 @@ scheduler_channel_wants_writes(channel_t *chan) 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_debug(LD_SCHED, - "Channel " U64_FORMAT " at %p entered waiting_for_cells", - U64_PRINTF_ARG(chan->global_identifier), chan); } } } diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 6a5b8d4f4..5e0e8be45 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -660,15 +660,11 @@ kist_scheduler_run(void) * starts having serious throughput issues. Best done in shadow/chutney. */ scheduler_set_channel_state(chan, SCHED_CHAN_WAITING_FOR_CELLS); - log_debug(LD_SCHED, "chan=%" PRIu64 " now waiting_for_cells", - chan->global_identifier); } else if (!channel_more_to_flush(chan)) {
/* Case 2: no more cells to send, but still open for writes */
scheduler_set_channel_state(chan, SCHED_CHAN_WAITING_FOR_CELLS); - log_debug(LD_SCHED, "chan=%" PRIu64 " now waiting_for_cells", - chan->global_identifier); } else if (!socket_can_write(&socket_table, chan)) {
/* Case 3: cells to send, but cannot write */ @@ -685,8 +681,6 @@ kist_scheduler_run(void) to_readd = smartlist_new(); } smartlist_add(to_readd, chan); - log_debug(LD_SCHED, "chan=%" PRIu64 " now waiting_to_write", - chan->global_identifier); } else {
/* Case 4: cells to send, and still open for writes */ diff --git a/src/or/scheduler_vanilla.c b/src/or/scheduler_vanilla.c index 64655c024..7a83b9da1 100644 --- a/src/or/scheduler_vanilla.c +++ b/src/or/scheduler_vanilla.c @@ -90,11 +90,6 @@ vanilla_scheduler_run(void) if (flushed < n_cells) { /* We ran out of cells to flush */ scheduler_set_channel_state(chan, SCHED_CHAN_WAITING_FOR_CELLS); - log_debug(LD_SCHED, - "Channel " U64_FORMAT " at %p " - "entered waiting_for_cells from pending", - U64_PRINTF_ARG(chan->global_identifier), - chan); } else { /* The channel may still have some cells */ if (channel_more_to_flush(chan)) { @@ -111,11 +106,6 @@ vanilla_scheduler_run(void) } else { /* It's waiting to be able to write more */ scheduler_set_channel_state(chan, SCHED_CHAN_WAITING_TO_WRITE); - log_debug(LD_SCHED, - "Channel " U64_FORMAT " at %p " - "entered waiting_to_write from pending", - U64_PRINTF_ARG(chan->global_identifier), - chan); } } else { /* No cells left; it can go to idle or waiting_for_cells */ @@ -125,22 +115,12 @@ vanilla_scheduler_run(void) * waiting_for_cells */ scheduler_set_channel_state(chan, SCHED_CHAN_WAITING_FOR_CELLS); - log_debug(LD_SCHED, - "Channel " U64_FORMAT " at %p " - "entered waiting_for_cells from pending", - U64_PRINTF_ARG(chan->global_identifier), - chan); } else { /* * We exactly filled up the output queue with all available * cells; go to idle. */ scheduler_set_channel_state(chan, SCHED_CHAN_IDLE); - log_debug(LD_SCHED, - "Channel " U64_FORMAT " at %p " - "become idle from pending", - U64_PRINTF_ARG(chan->global_identifier), - chan); } } }