diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-11-13 13:38:01 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-11-17 08:53:34 -0500 |
commit | b1d56fc5890fb6d594e70520c09d040e9b2e1544 (patch) | |
tree | 8777eb9aaa8b1f53ad136b34c4408fa0f1a0b899 /src/or/main.c | |
parent | b91bd27e6f94e76359097e1ec53494ea5168108d (diff) | |
download | tor-b1d56fc5890fb6d594e70520c09d040e9b2e1544.tar.gz tor-b1d56fc5890fb6d594e70520c09d040e9b2e1544.zip |
Decouple ..attach_circuit() from most of its callers.
Long ago we used to call connection_ap_handshake_attach_circuit()
only in a few places, since connection_ap_attach_pending() attaches
all the pending connections, and does so regularly. But this turned
out to have a performance problem: it would introduce a delay to
launching or connecting a stream.
We couldn't just call connection_ap_attach_pending() every time we
make a new connection, since it walks the whole connection list. So
we started calling connection_ap_attach_pending all over, instead!
But that's kind of ugly and messes up our callgraph.
So instead, we now have connection_ap_attach_pending() use a list
only of the pending connections, so we can call it much more
frequently. We have a separate function to scan the whole
connection array to see if we missed adding anything, and log a
warning if so.
Closes ticket #17590
Diffstat (limited to 'src/or/main.c')
-rw-r--r-- | src/or/main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index afcb313574..bfa41b964c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2505,6 +2505,11 @@ run_main_loop_once(void) } } + /* This should be pretty fast if nothing is pending. BUT... watch out; + * we need to make sure it doesn't show up in the profiles. five times a + * second would be enough, for instance. */ + connection_ap_attach_pending(); + return 1; } |