From: Mike Hommey <mh@glandium.org>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>
Subject: Re: fast-import's gfi_unpack_entry causes too many munmap/mmap cycles
Date: Sat, 16 Apr 2016 20:04:03 +0900 [thread overview]
Message-ID: <20160416110403.GA19197@glandium.org> (raw)
In-Reply-To: <20160416091839.GA12764@glandium.org>
On Sat, Apr 16, 2016 at 06:18:39PM +0900, Mike Hommey wrote:
> And even if I am okay with that overhead, I still hit the problem again
> when using that tree later with `M 040000 $sha1 ` in the next commit,
> because that does a load_tree() for the tree sha1, after a commit having
> occurred, which touched the pack, bringing me back to square one (the
> sad part being that it does so while the tree_content for the tree in
> question is already in memory).
So, interestingly, the load_tree() doesn't happen when using `from
0000000000000000000000000000000000000000\nmerge :mark` for the commit.
That is, with:
commit refs/foo
committer <foo@foo> 0 +0
data 0
M 040000 bff3a42ecae0e7c8f707d328f9432c1ffe9644b0 ""
load_tree is called. And with:
commit refs/foo
committer <foo@foo> 0 +0
data 0
from 0000000000000000000000000000000000000000
merge :mark_of_parent
M 040000 bff3a42ecae0e7c8f707d328f9432c1ffe9644b0 ""
it's not called.
So I think I got myself a workaround...
> A --- B
> \
> \-- C
>
> I have:
> - diff between null-tree and A
> - diff between A and B
> - diff between B and C
I should be able to do:
- start the commit command for A
- before finishing it, `ls ""`
- then apply the diff for B and `ls ""`
- then apply the diff for C and `ls ""`
- then `deleteall`
- then `M 040000 sha1_from_first_ls ` and finally finish A
- create the commit for B with `from
0000000000000000000000000000000000000000\nmerge :mark` and `M 040000
sha1_from_second_ls`
- likewise for C
... and avoid gfi_unpack_entry.
Mike
next prev parent reply other threads:[~2016-04-16 11:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-16 9:18 fast-import's gfi_unpack_entry causes too many munmap/mmap cycles Mike Hommey
2016-04-16 9:31 ` Mike Hommey
2016-04-16 11:04 ` Mike Hommey [this message]
2016-04-17 0:54 ` Mike Hommey
2016-04-17 1:13 ` Mike Hommey
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=20160416110403.GA19197@glandium.org \
--to=mh@glandium.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--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.
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).