On Fri, Oct 05, 2012 at 01:34:02PM -0700, Junio C Hamano wrote:
> OK, I think I am convinced myself that this patch is the right fix.
>
> The performance regression Markus saw is in fmt-merge-message, and
> it is caused by the updated remove_redundant() that is used by
> get_merge_bases_many() and reduce_heads(). On the topic branch, all
> callers of reduce_heads() were passing commits that are already
> parsed, but before the topic was merged to 'master', we added one
> more caller to reduce_heads() on the 'master' front that passed an
> unparsed commit, which is why the problem surfaced at that merge.
Thanks for tracking it down. That makes a lot of sense with the results
we are seeing.
> It might make sense to assert or die in commit_list_insert_by_date()
> when a caller mistakenly pass an unparsed commit object to prevent
> this kind of breakages in the future.
I wonder if it would be too much to just have commit_list_insert_by_date
call parse_commit. It is, after all, the exact moment when we need to
have the date valid (and by waiting until the last minute, we can
potentially avoid parses that would not otherwise need to happen). The
overhead in the common case should basically be the same as an assert:
checking that commit->object.parsed is true (we can always inline that
bit of parse_commit if we have to).
Of course, in this case it is not just commit_list_insert_by_date that
cares. paint_down_to_common also want commit->parents to be valid; I'm
surprised that dealing with unparsed commits did not also reveal an
error there.
In an object-oriented world, we would always get the attributes of a
commit through accessors that made sure the object was parsed. That
would be nicer, but it would also mean paying for the "if (parsed)"
conditional a lot more frequently.
> > @@ -617,6 +618,8 @@ static struct commit_list *paint_down_to_common(struct commit *one, int n, struc
> >
> > one->object.flags |= PARENT1;
> > commit_list_insert_by_date(one, &list);
> > + if (!n)
> > + return list;
> > for (i = 0; i < n; i++) {
> > twos[i]->object.flags |= PARENT2;
> > commit_list_insert_by_date(twos[i], &list);
This seems like an obvious optimization, but does it really have
anything to do with the patch at hand?
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html