diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-09 13:48:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-14 11:57:51 -0400 |
| commit | 1a74360c2dd5c197e2dfc28b37961c77bb7792f1 (patch) | |
| tree | d1e856ff67b9dcf2a97fabaaea5fc599566a62d6 /src/or/channel.c | |
| parent | 102bb1c04f5cb4fb3eae7f41f80660e47c64ceb6 (diff) | |
| download | tor-1a74360c2dd5c197e2dfc28b37961c77bb7792f1.tar.gz tor-1a74360c2dd5c197e2dfc28b37961c77bb7792f1.zip | |
Test code for implementation of faster circuit_unlink_all_from_channel
This contains the obvious implementation using the circuitmux data
structure. It also runs the old (slow) algorithm and compares
the results of the two to make sure that they're the same.
Needs review and testing.
Diffstat (limited to 'src/or/channel.c')
| -rw-r--r-- | src/or/channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 9f6887588e..32e87c342c 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -800,7 +800,7 @@ channel_free(channel_t *chan) /* Get rid of cmux */ if (chan->cmux) { - circuitmux_detach_all_circuits(chan->cmux); + circuitmux_detach_all_circuits(chan->cmux, NULL); circuitmux_mark_destroyed_circids_usable(chan->cmux, chan); circuitmux_free(chan->cmux); chan->cmux = NULL; @@ -2860,7 +2860,7 @@ channel_free_list(smartlist_t *channels, int mark_for_close) channel_state_to_string(curr->state), curr->state); /* Detach circuits early so they can find the channel */ if (curr->cmux) { - circuitmux_detach_all_circuits(curr->cmux); + circuitmux_detach_all_circuits(curr->cmux, NULL); } channel_unregister(curr); if (mark_for_close) { |