commit aadff62745bfa15816ba8c725d9b9cf17abb53d0 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 30 13:31:27 2015 -0400

Do not autoflush control connections as their outbufs get big

Doing this is no longer necessary, and it leads to weird recursions in our call graph. Closes ticket 16480. --- changes/decouple-write-handle_write | 7 +++++++ src/or/connection.c | 28 ---------------------------- 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/changes/decouple-write-handle_write b/changes/decouple-write-handle_write new file mode 100644 index 0000000..4ef9b3f --- /dev/null +++ b/changes/decouple-write-handle_write @@ -0,0 +1,7 @@ + o Removed features: + - Remove the code that would try to aggressively flush controller + connections while writing to them. This code was introduced in + 0.1.2.7-alpha, in order to keep output buffers from exceeding their + limits. But there is no longer a maximum output buffer size, and + flushing data in this way caused some undesirable recursions + in our call graph. Closes ticket 16480. diff --git a/src/or/connection.c b/src/or/connection.c index 2cca6e4..ac36578 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4206,34 +4206,6 @@ connection_write_to_buf_impl_,(const char *string, size_t len, conn->outbuf_flushlen += buf_datalen(conn->outbuf) - old_datalen; } else { conn->outbuf_flushlen += len; - - /* Should we try flushing the outbuf now? */ - if (conn->in_flushed_some) { - /* Don't flush the outbuf when the reason we're writing more stuff is - * _because_ we flushed the outbuf. That's unfair. */ - return; - } - - if (conn->type == CONN_TYPE_CONTROL && - !connection_is_rate_limited(conn) && - conn->outbuf_flushlen-len < 1<<16 && - conn->outbuf_flushlen >= 1<<16) { - /* just try to flush all of it */ - } else - return; /* no need to try flushing */ - - if (connection_handle_write(conn, 0) < 0) { - if (!conn->marked_for_close) { - /* this connection is broken. remove it. */ - log_warn(LD_BUG, "unhandled error on write for " - "conn (type %d, fd %d); removing", - conn->type, (int)conn->s); - tor_fragile_assert(); - /* do a close-immediate here, so we don't try to flush */ - connection_close_immediate(conn); - } - return; - } } }