[Olsr-dev] obsolete branches

[Markus Kittenberger]

On Wed, Mar 2, 2011 at 2:41 PM, L. Aaron Kaplan <(spam-protected)> wrote:

> >
> > but you should also look into the content/diff of the branches,...
> >
> > incremental2 was created and last modified on 6th Dez, an contains no
> commits (and therefore looks like merged, and could be deleted,.. *G)
> >
> > incremental was created on 5th Dez. and last modified on 17th Dez. (and
> has a dozen commits)
> >
>
> If I understood correctly, the incremental Dijkstra will be part of the
> newer olsr releases by default, right Markus?
>
yep, when its ready,.
likely in olsrd 0.7.0

the "incremental" branch is just a indeed working proof of concept, ..
(based on 0.6.1/stable)
(which was also used for some benchmarking)

>
> Do you have some measurement data that I can put on the web site?
>
in theory yes, there are some callgrind files lying around on my
testserver,.. *G

but i think its better to benchmark the final implementation based on master
tree / olsrv2, as in stable tree we found that much cpu is wasted outside of
the dijkstra in lists, where in master avl trees are already used,..

>
> a.
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.olsr.org/pipermail/olsr-dev/attachments/20110302/533a0235/attachment.html>