[tor-bugs] #3406 [Torctl]: High memory usage from parse_ns_body
Tor Bug Tracker & Wiki
torproject-admin at torproject.org
Fri Jun 17 23:03:55 UTC 2011
#3406: High memory usage from parse_ns_body
--------------------+-------------------------------------------------------
Reporter: atagar | Owner:
Type: defect | Status: needs_review
Priority: normal | Milestone:
Component: Torctl | Version:
Keywords: | Parent:
Points: | Actualpoints:
--------------------+-------------------------------------------------------
Comment(by mikeperry):
Replying to [comment:4 atagar]:
> > FYI, all your other branches look good to merge, but I can't merge
them easily because the commit for #3406 is in them for some reason.
>
> Great. I'm not clear how you want this patch changed. It lowered the
get_network_status memory usage dramatically so it's doing exactly what
I'd intended.
Ok. I may just copy the change to get_consensus myself then.
> Btw, the reason the patches are based on each other was to avoid merging
headaches for you (and also let me test the end result over these last few
days). Otherwise you'd be having conflicts with many of these patches.
>
> If separate patches based on master is *really* what you want then you
can still get this by cherry-picking the changes... and then doing the
conflict resolution and retested you would have needed via that route. :P
Well, no, I don't want separate patches. But the one-branch-for-each-bug-
but-also-several-bugs-in-each-branch madness is also causing conflicts
now, because I merged some of them but not all, and I don't know which one
to merge next.
Which branch contains all of them?
In the future, if fixes end up causing conflicts such that you have to
each fix appear in multiple branches, just lable each commit with the bug
number in the git shortdesc, and use only one branch.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/3406#comment:5>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list