From: Linus Torvalds <torvalds@osdl.org>
To: Petr Baudis <pasky@suse.cz>
Cc: Junio C Hamano <junkio@cox.net>,
Peter Eriksen <s022018@student.dtu.dk>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Bottlenecks in git merge
Date: Tue, 31 Jan 2006 17:04:00 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0601311701000.7301@g5.osdl.org> (raw)
In-Reply-To: <20060201005035.GD31278@pasky.or.cz>
On Wed, 1 Feb 2006, Petr Baudis wrote:
>
> xpasky@machine[0:0]~/linux-2.6.git$ echo -e '#!/bin/sh\n/bin/true' >r && chmod a+x r
> xpasky@machine[0:0]~/linux-2.6.git$ time git-merge-index -o ./r -a
>
> real 0m3.827s
> user 0m1.788s
> sys 0m2.004s
> xpasky@machine[0:0]~/linux-2.6.git$ time git-merge-index -o ~/git-pb/git-merge-one-file -a
> [lots of "Removing"]
>
> real 1m21.773s
> user 0m30.806s
> sys 0m13.248s
>
> The costs are apparently in git-update-index, not in the shell.
Btw, this is where "oprofile" really shines. You can get exact listings of
which symbols in which programs are taking up CPU-time, even when the time
is spent in hundreds of different executions of a program.
Me, I'm too lazy to use it often, but not too lazy to point others towards
it.
You do need to have kernel support for it compiled in, and it works better
on certain CPU's (that have supported counters) than on others.
Linus
next prev parent reply other threads:[~2006-02-01 1:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-31 21:33 Bottlenecks in git merge Peter Eriksen
2006-01-31 23:06 ` Junio C Hamano
2006-01-31 23:35 ` Petr Baudis
2006-02-01 0:43 ` Junio C Hamano
2006-01-31 23:45 ` Linus Torvalds
2006-02-01 0:50 ` Petr Baudis
2006-02-01 1:04 ` Linus Torvalds [this message]
2006-01-31 23:27 ` Petr Baudis
2006-02-04 7:31 ` [PATCH] read-tree --aggressive Junio C Hamano
2006-02-04 11:52 ` Peter Eriksen
2006-02-04 12:56 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0601311701000.7301@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=pasky@suse.cz \
--cc=s022018@student.dtu.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).