From: Peter Krefting <peter@softwolves.pp.se>
To: Jeff King <peff@peff.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: cherry-pick very slow on big repository
Date: Fri, 10 Nov 2017 13:37:12 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.00.1711101333030.2391@ds9.cixit.se> (raw)
In-Reply-To: <20171110102011.yqtka6a3wmgcvkl6@sigill.intra.peff.net>
Jeff King:
> Can you get a backtrace? I'd do something like:
Seems that it spends most time in diffcore_count_changes(), that is
where it hits whenever I hit Ctrl+C (various line numbers 199-207 in
diffcore-delta.c; this is on the v2.15.0 tag).
(gdb) bt
#0 diffcore_count_changes (src=src@entry=0x55555db99970,
dst=dst@entry=0x55555d6a4810,
src_count_p=src_count_p@entry=0x55555db99998,
dst_count_p=dst_count_p@entry=0x55555d6a4838,
src_copied=src_copied@entry=0x7fffffffd3e0,
literal_added=literal_added@entry=0x7fffffffd3f0)
at diffcore-delta.c:203
#1 0x00005555556dee1a in estimate_similarity (minimum_score=30000,
dst=0x55555d6a4810, src=0x55555db99970) at diffcore-rename.c:193
#2 diffcore_rename (options=options@entry=0x7fffffffd4f0)
at diffcore-rename.c:560
#3 0x0000555555623d83 in diffcore_std (
options=options@entry=0x7fffffffd4f0) at diff.c:5846
#4 0x000055555564ab46 in get_renames (o=o@entry=0x7fffffffd850,
tree=tree@entry=0x5555559d1b98,
o_tree=o_tree@entry=0x5555559d1bc0,
a_tree=a_tree@entry=0x5555559d1b98,
b_tree=b_tree@entry=0x5555559d1b70,
entries=entries@entry=0x555559351d20) at merge-recursive.c:554
#5 0x000055555564e7d9 in merge_trees (o=o@entry=0x7fffffffd850,
head=head@entry=0x5555559d1b98, merge=<optimized out>,
merge@entry=0x5555559d1b70, common=<optimized out>,
common@entry=0x5555559d1bc0, result=result@entry=0x7fffffffd830)
at merge-recursive.c:1985
#6 0x000055555569b2cc in do_recursive_merge (opts=0x7fffffffdf70,
msgbuf=0x7fffffffd810, head=0x7fffffffd7f0,
next_label=<optimized out>, base_label=<optimized out>,
next=<optimized out>, base=0x5555559c1ba0) at sequencer.c:459
#7 do_pick_commit (command=TODO_PICK,
commit=commit@entry=0x5555559c1b60,
opts=opts@entry=0x7fffffffdf70, final_fixup=final_fixup@entry=0)
at sequencer.c:1088
#8 0x000055555569e324 in single_pick (opts=0x7fffffffdf70,
cmit=0x5555559c1b60) at sequencer.c:2306
#9 sequencer_pick_revisions (opts=0x7fffffffdf70)
at sequencer.c:2355
#10 0x00005555555d4097 in run_sequencer (argc=1, argc@entry=3,
argv=argv@entry=0x7fffffffe320, opts=<optimized out>,
opts@entry=0x7fffffffdf70) at builtin/revert.c:200
#11 0x00005555555d449a in cmd_cherry_pick (argc=3,
argv=0x7fffffffe320, prefix=<optimized out>)
at builtin/revert.c:225
#12 0x0000555555567a38 in run_builtin (argv=<optimized out>,
argc=<optimized out>, p=<optimized out>) at git.c:346
#13 handle_builtin (argc=3, argv=0x7fffffffe320) at git.c:554
#14 0x0000555555567cf6 in run_argv (argv=0x7fffffffe0e0,
argcp=0x7fffffffe0ec) at git.c:606
#15 cmd_main (argc=<optimized out>, argv=<optimized out>)
at git.c:683
#16 0x0000555555566e01 in main (argc=4, argv=0x7fffffffe318)
at common-main.c:43
--
\\// Peter - http://www.softwolves.pp.se/
next prev parent reply other threads:[~2017-11-10 12:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 9:39 cherry-pick very slow on big repository Peter Krefting
2017-11-10 10:20 ` Jeff King
2017-11-10 12:37 ` Peter Krefting [this message]
2017-11-10 12:59 ` Derrick Stolee
2017-11-10 14:05 ` Peter Krefting
2017-11-10 17:04 ` Kevin Willford
2017-11-13 11:19 ` Peter Krefting
2017-11-10 17:37 ` Elijah Newren
2017-11-10 23:32 ` Elijah Newren
2017-11-13 11:22 ` Peter Krefting
2017-11-13 18:09 ` Elijah Newren
2017-11-21 12:07 ` Peter Krefting
2017-11-21 17:14 ` Elijah Newren
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.00.1711101333030.2391@ds9.cixit.se \
--to=peter@softwolves.pp.se \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).