Re: [PATCH 2/2] commit: use a priority queue in merge base functions

From: Jeff King <peff@peff.net>
Date: Aug 29, 2012, 20:53 UTC
Message-ID: <20120829205332.GA16064@sigill.intra.peff.net>
In-Reply-To: <7vtxvlwt7o.fsf@alter.siamese.dyndns.org>

On Wed, Aug 29, 2012 at 09:36:43AM -0700, Junio C Hamano wrote:

Show 16 quoted lines

> Jeff King <peff@peff.net> writes:
> 
> > The merge-base functions internally keep a commit lists and
> > insert by date, which causes a linear search of the commit
> > list for each insertion. Let's use a priority queue instead.
> >
> > Unfortunately, from my experiments, this didn't actually
> > cause any speedup.
> >
> > Signed-off-by: Jeff King <peff@peff.net>
> > ---
> > I'd probably split this into a few commits if we were really going to
> > apply it, but since it doesn't actually make anything faster, I doubt
> > the code churn is worth it.
> 
> Thanks.  This seems to break t6010-merge-base.sh for me, though...

Interesting. It works fine here, even under --valgrind. Did you apply the patches directly on top of 1251cc7?

Not that it matters _too_ much if we are just going to scrap it anyway, but maybe it is an indication that I screwed up something that could impact the timing (I did check that the timed merge-base calculations on linux-2.6 yielded the same results though).

-Peff