[tor-dev] Help with rebasing arma's n23-5 tor branch to current master

[Charlie Belmer]

Hey Everyone,

I wanted to give quick update on N23 rebasing progress:

   - Rebase N23 onto Master (Complete)
   - Refactor N23 to use channels (Complete)
   - Make clean w/ check-spaces (50%. ETA 7/28)
   - Testing with Chutney (To-Do)

Charlie


On Thu, Jul 18, 2013 at 11:43 AM, Karsten Loesing <karsten at torproject.org>wrote:

> On 7/18/13 5:30 PM, Charlie Belmer wrote:
> > Karsten, I'll take a shot at it. Is there a specific timeline I should be
> > aware of? My C is a little rusty and I am working to learn the codebase
> > (This sounds like a good opportunity to learn more). I don't want to bite
> > off more than I can chew if there is a tight release timeline.
>
> Neat!
>
> We have until end of October to "Write a proposal for N23, and write a
> patch for N23 that functions correctly. Then simulate it to see how it
> performs for typical and for really slow client connections."
>
> We're sorta doing this in opposite direction, because there's already a
> patch, and we want to find out if performance improvements are worth
> writing a proposal and cleaning up the patch enough to actually merge it
> into 0.2.5.x.
>
> So, we have 3.5 months for everything.  I'd think that 1 month for
> rebasing the existing branch would leave us enough time to run
> simulations and possibly write the proposal.  Is mid-August a reasonable
> time frame for you?
>
> Of course, if you realize you can't work on this, please let us know as
> early as possible, so that somebody else can give it a try.
>
> Thanks for helping!
>
> Best,
> Karsten
>
>
> > On Thu, Jul 18, 2013 at 8:50 AM, Karsten Loesing <karsten at torproject.org
> >wrote:
> >
> >> Dear tor-devs,
> >>
> >> is anyone here up for a coding task that could help us research
> >> performance improvements of the N23 design more?
> >>
> >> The situation is that we already have a branch (n23-5 in arma's public
> >> repository), but it's based on 0.2.4.3-alpha-dev and needs to be rebased
> >> to current master.
> >>
> >> In theory, it's as simple as the following steps:
> >>
> >> $ git clone https://git.torproject.org/tor.git
> >> $ cd tor/
> >> $ git remote add arma https://git.torproject.org/arma/tor.git
> >> $ git fetch arma
> >> $ git checkout -b n23-5 arma/n23-5
> >> $ git fetch origin
> >> $ git rebase origin/master
> >> (clean up the mess)
> >> $ git add
> >> $ git commit
> >> $ git rebase --continue
> >> (back to clean-up-the-mess step until git is happy)
> >> $ git push public n23-5
> >>
> >> Bonus points if you make sure the branch compiles with gcc warnings
> >> enabled, appeases make check-spaces, and runs peacefully in a private
> >> Chutney network.
> >>
> >> Unfortunately, the n23-5 branch touches a few places in the tor code
> >> that have been refactored in current master, including Andrea's
> >> connection/channel rewrite.  It might be necessary to dive into the
> >> channel thing in order to get this rebase right.
> >>
> >> Once we have a refactored n23-5 branch, I'll try to simulate it in
> Shadow.
> >>
> >> For a tiny bit of context, this is for our sponsor F item 13:
> >>
> >>
> https://trac.torproject.org/projects/tor/wiki/org/sponsors/SponsorF/Year3
> >>
> >> I'm asking here, because the usual suspects are already overloaded with
> >> other stuff.  As usual, I guess.
> >>
> >> Thanks,
> >> Karsten
> >> _______________________________________________
> >> tor-dev mailing list
> >> tor-dev at lists.torproject.org
> >> https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev
> >>
> >
> >
> >
> > _______________________________________________
> > tor-dev mailing list
> > tor-dev at lists.torproject.org
> > https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev
> >
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-dev/attachments/20130727/e9e7bbce/attachment.html>