[prev in list] [next in list] [prev in thread] [next in thread]
List: tor-dev
Subject: Re: [tor-dev] Help with rebasing arma's n23-5 tor branch to current master
From: Charlie Belmer <charlie.belmer () gmail ! com>
Date: 2013-07-30 18:44:26
Message-ID: CAH+=uu+tAkWs1jcL4ySySk3cfiO9QyRzn4Cv4EKEe_kyzVwoTQ () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Hi Karsten,
I probably can't make the meeting since it is during my work day, but I'll
try. I might be able to just leave myself logged in to the chat from home
so I can read the transcript later.
You can grab my commits here: http://www.charliebelmer.com/tor.git:
git clone http://www.charliebelmer.com/tor.git
Basically, I took Arma's branch, and rebased the current master onto it.
There were a number of merge issues, including the connection to channel
changes that Andrea developed. I believe that I converted N23 to work with
channels correctly, though I am still trying to figure out how to actually
validate it properly (aside from basic run testing - advice / thoughts /
instructions welcome!). I expect it will need some tweaks.
I started playing around with Chutney, but I don't fully understand what it
does yet, so more to come there.
I would be happy to help take this section forward however you need - it
sounds interesting learning how to test this to see what performance gains
it might yield, if any.
Charlie
On Tue, Jul 30, 2013 at 4:05 AM, Karsten Loesing <karsten@torproject.org>wrote:
> On 7/27/13 5:55 PM, Charlie Belmer wrote:
> > 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)
>
> Sounds great!
>
> We'll have an IRC meeting on Wed July 31, 18:00 to 19:00 UTC in #tor-dev
> to discuss deliverables including this one.
>
> Can you give me more details what you achieved and maybe push your
> rebased branch somewhere, so that I can report your progress at the
> meeting?
>
> Or do you want to join the meeting? If so, see my earlier mail to this
> list for details.
>
> Thanks!
> Karsten
>
>
> > On Thu, Jul 18, 2013 at 11:43 AM, Karsten Loesing <
> karsten@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@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@lists.torproject.org
> >>>> https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev
> >>>>
> >>>
> >>>
> >>>
> >>> _______________________________________________
> >>> tor-dev mailing list
> >>> tor-dev@lists.torproject.org
> >>> https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev
> >>>
> >>
> >>
> >
>
>
[Attachment #5 (text/html)]
<div dir="ltr"><div><div><div><div>Hi Karsten,<br><br>I probably can't make the \
meeting since it is during my work day, but I'll try. I might be able to just \
leave myself logged in to the chat from home so I can read the transcript later.<br> \
<br></div><div>You can grab my commits here: <a \
href="http://www.charliebelmer.com/tor.git">http://www.charliebelmer.com/tor.git</a>:<br></div><div \
style="margin-left:40px"><span style="font-family:courier new,monospace"><br> git \
clone <a href="http://www.charliebelmer.com/tor.git">http://www.charliebelmer.com/tor.git</a><br><br></span></div>Basically, \
I took Arma's branch, and rebased the current master onto it. There were a number \
of merge issues, including the connection to channel changes that Andrea developed. I \
believe that I converted N23 to work with channels correctly, though I am still \
trying to figure out how to actually validate it properly (aside from basic run \
testing - advice / thoughts / instructions welcome!). I expect it will need some \
tweaks.<br> <br></div>I started playing around with Chutney, but I don't fully \
understand what it does yet, so more to come there.<br><br></div>I would be happy to \
help take this section forward however you need - it sounds interesting learning how \
to test this to see what performance gains it might yield, if any.<br> \
<br></div>Charlie<br><div><div><div><div><div><span style="font-family:courier \
new,monospace"></span></div></div></div></div></div></div><div \
class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Jul 30, 2013 at 4:05 AM, \
Karsten Loesing <span dir="ltr"><<a href="mailto:karsten@torproject.org" \
target="_blank">karsten@torproject.org</a>></span> wrote:<br> <blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div class="im">On 7/27/13 5:55 PM, Charlie Belmer wrote:<br> \
> Hey Everyone,<br> ><br>
> I wanted to give quick update on N23 rebasing progress:<br>
><br>
</div>> - Rebase N23 onto Master (Complete)<br>
> - Refactor N23 to use channels (Complete)<br>
> - Make clean w/ check-spaces (50%. ETA 7/28)<br>
> - Testing with Chutney (To-Do)<br>
<br>
Sounds great!<br>
<br>
We'll have an IRC meeting on Wed July 31, 18:00 to 19:00 UTC in #tor-dev<br>
to discuss deliverables including this one.<br>
<br>
Can you give me more details what you achieved and maybe push your<br>
rebased branch somewhere, so that I can report your progress at the meeting?<br>
<br>
Or do you want to join the meeting? If so, see my earlier mail to this<br>
list for details.<br>
<br>
Thanks!<br>
<div class="HOEnZb"><div class="h5">Karsten<br>
<br>
<br>
> On Thu, Jul 18, 2013 at 11:43 AM, Karsten Loesing <<a \
href="mailto:karsten@torproject.org">karsten@torproject.org</a>>wrote:<br> \
><br> >> On 7/18/13 5:30 PM, Charlie Belmer wrote:<br>
>>> Karsten, I'll take a shot at it. Is there a specific timeline I \
should be<br> >>> aware of? My C is a little rusty and I am working to learn \
the codebase<br> >>> (This sounds like a good opportunity to learn more). I \
don't want to bite<br> >>> off more than I can chew if there is a tight \
release timeline.<br> >><br>
>> Neat!<br>
>><br>
>> We have until end of October to "Write a proposal for N23, and write \
a<br> >> patch for N23 that functions correctly. Then simulate it to see how \
it<br> >> performs for typical and for really slow client \
connections."<br> >><br>
>> We're sorta doing this in opposite direction, because there's \
already a<br> >> patch, and we want to find out if performance improvements are \
worth<br> >> writing a proposal and cleaning up the patch enough to actually \
merge it<br> >> into 0.2.5.x.<br>
>><br>
>> So, we have 3.5 months for everything. I'd think that 1 month for<br>
>> rebasing the existing branch would leave us enough time to run<br>
>> simulations and possibly write the proposal. Is mid-August a reasonable<br>
>> time frame for you?<br>
>><br>
>> Of course, if you realize you can't work on this, please let us know \
as<br> >> early as possible, so that somebody else can give it a try.<br>
>><br>
>> Thanks for helping!<br>
>><br>
>> Best,<br>
>> Karsten<br>
>><br>
>><br>
>>> On Thu, Jul 18, 2013 at 8:50 AM, Karsten Loesing <<a \
href="mailto:karsten@torproject.org">karsten@torproject.org</a><br> >>> \
wrote:<br> >>><br>
>>>> Dear tor-devs,<br>
>>>><br>
>>>> is anyone here up for a coding task that could help us research<br>
>>>> performance improvements of the N23 design more?<br>
>>>><br>
>>>> The situation is that we already have a branch (n23-5 in arma's \
public<br> >>>> repository), but it's based on 0.2.4.3-alpha-dev and \
needs to be rebased<br> >>>> to current master.<br>
>>>><br>
>>>> In theory, it's as simple as the following steps:<br>
>>>><br>
>>>> $ git clone <a href="https://git.torproject.org/tor.git" \
target="_blank">https://git.torproject.org/tor.git</a><br> >>>> $ cd \
tor/<br> >>>> $ git remote add arma <a \
href="https://git.torproject.org/arma/tor.git" \
target="_blank">https://git.torproject.org/arma/tor.git</a><br> >>>> $ \
git fetch arma<br> >>>> $ git checkout -b n23-5 arma/n23-5<br>
>>>> $ git fetch origin<br>
>>>> $ git rebase origin/master<br>
>>>> (clean up the mess)<br>
>>>> $ git add<br>
>>>> $ git commit<br>
>>>> $ git rebase --continue<br>
>>>> (back to clean-up-the-mess step until git is happy)<br>
>>>> $ git push public n23-5<br>
>>>><br>
>>>> Bonus points if you make sure the branch compiles with gcc \
warnings<br> >>>> enabled, appeases make check-spaces, and runs \
peacefully in a private<br> >>>> Chutney network.<br>
>>>><br>
>>>> Unfortunately, the n23-5 branch touches a few places in the tor \
code<br> >>>> that have been refactored in current master, including \
Andrea's<br> >>>> connection/channel rewrite. It might be necessary \
to dive into the<br> >>>> channel thing in order to get this rebase \
right.<br> >>>><br>
>>>> Once we have a refactored n23-5 branch, I'll try to simulate it \
in<br> >> Shadow.<br>
>>>><br>
>>>> For a tiny bit of context, this is for our sponsor F item 13:<br>
>>>><br>
>>>><br>
>> <a href="https://trac.torproject.org/projects/tor/wiki/org/sponsors/SponsorF/Year3" \
target="_blank">https://trac.torproject.org/projects/tor/wiki/org/sponsors/SponsorF/Year3</a><br>
>>>><br>
>>>> I'm asking here, because the usual suspects are already \
overloaded with<br> >>>> other stuff. As usual, I guess.<br>
>>>><br>
>>>> Thanks,<br>
>>>> Karsten<br>
>>>> _______________________________________________<br>
>>>> tor-dev mailing list<br>
>>>> <a href="mailto:tor-dev@lists.torproject.org">tor-dev@lists.torproject.org</a><br>
>>>> <a \
href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev" \
target="_blank">https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev</a><br> \
>>>><br> >>><br>
>>><br>
>>><br>
>>> _______________________________________________<br>
>>> tor-dev mailing list<br>
>>> <a href="mailto:tor-dev@lists.torproject.org">tor-dev@lists.torproject.org</a><br>
>>> <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev" \
target="_blank">https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev</a><br> \
>>><br> >><br>
>><br>
><br>
<br>
</div></div></blockquote></div><br></div>
_______________________________________________
tor-dev mailing list
tor-dev@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic