From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Lars Schneider <larsxschneider@gmail.com>,
Git Users <git@vger.kernel.org>,
Thomas Gummerer <t.gummerer@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH 2/3] write_entry: avoid reading blobs in CE_RETRY case
Date: Tue, 10 Oct 2017 09:00:26 +0900 [thread overview]
Message-ID: <xmqq376rswh1.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171009174852.32dpy5xh3w3bfn6t@sigill.intra.peff.net> (Jeff King's message of "Mon, 9 Oct 2017 13:48:52 -0400")
Jeff King <peff@peff.net> writes:
> When retrying a delayed filter-process request, we don't
> need to send the blob to the filter a second time. However,
> we read it unconditionally into a buffer, only to later
> throw away that buffer. We can make this more efficient by
> skipping the read in the first place when it isn't
> necessary.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> entry.c | 25 ++++++++++++++-----------
> 1 file changed, 14 insertions(+), 11 deletions(-)
Again, looks obviously correct. Thanks.
>
> diff --git a/entry.c b/entry.c
> index 637c5958b0..bec51e37a2 100644
> --- a/entry.c
> +++ b/entry.c
> @@ -240,6 +240,7 @@ static int write_entry(struct cache_entry *ce,
> char *path, const struct checkout *state, int to_tempfile)
> {
> unsigned int ce_mode_s_ifmt = ce->ce_mode & S_IFMT;
> + struct delayed_checkout *dco = state->delayed_checkout;
> int fd, ret, fstat_done = 0;
> char *new;
> struct strbuf buf = STRBUF_INIT;
> @@ -261,10 +262,19 @@ static int write_entry(struct cache_entry *ce,
> switch (ce_mode_s_ifmt) {
> case S_IFREG:
> case S_IFLNK:
> - new = read_blob_entry(ce, &size);
> - if (!new)
> - return error("unable to read sha1 file of %s (%s)",
> - path, oid_to_hex(&ce->oid));
> + /*
> + * We do not send the blob in case of a retry, so do not
> + * bother reading it at all.
> + */
> + if (ce_mode_s_ifmt == S_IFREG && dco && dco->state == CE_RETRY) {
> + new = NULL;
> + size = 0;
> + } else {
> + new = read_blob_entry(ce, &size);
> + if (!new)
> + return error("unable to read sha1 file of %s (%s)",
> + path, oid_to_hex(&ce->oid));
> + }
>
> if (ce_mode_s_ifmt == S_IFLNK && has_symlinks && !to_tempfile) {
> ret = symlink(new, path);
> @@ -279,14 +289,7 @@ static int write_entry(struct cache_entry *ce,
> * Convert from git internal format to working tree format
> */
> if (ce_mode_s_ifmt == S_IFREG) {
> - struct delayed_checkout *dco = state->delayed_checkout;
> if (dco && dco->state != CE_NO_DELAY) {
> - /* Do not send the blob in case of a retry. */
> - if (dco->state == CE_RETRY) {
> - free(new);
> - new = NULL;
> - size = 0;
> - }
> ret = async_convert_to_working_tree(
> ce->name, new, size, &buf, dco);
> if (ret && string_list_has_string(&dco->paths, ce->name)) {
next prev parent reply other threads:[~2017-10-10 0:00 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-05 10:44 [PATCH v1 0/2] fix temporary garbage in the cache entry lars.schneider
2017-10-05 10:44 ` [PATCH v1 1/2] entry.c: update cache entry only for existing files lars.schneider
2017-10-05 11:12 ` Jeff King
2017-10-05 11:19 ` Junio C Hamano
2017-10-05 11:26 ` Jeff King
2017-10-05 23:01 ` Junio C Hamano
2017-10-06 4:54 ` Jeff King
2017-10-08 21:37 ` Lars Schneider
2017-10-09 17:47 ` Jeff King
2017-10-09 17:48 ` [PATCH 1/3] write_entry: fix leak when retrying delayed filter Jeff King
2017-10-10 0:00 ` Junio C Hamano
2017-10-10 9:23 ` Simon Ruderich
2017-10-10 9:25 ` Jeff King
2017-10-10 9:49 ` Simon Ruderich
2017-10-09 17:48 ` [PATCH 2/3] write_entry: avoid reading blobs in CE_RETRY case Jeff King
2017-10-10 0:00 ` Junio C Hamano [this message]
2017-10-09 17:50 ` [PATCH 3/3] write_entry: untangle symlink and regular-file cases Jeff King
2017-10-10 0:03 ` Junio C Hamano
2017-10-05 10:44 ` [PATCH v1 2/2] entry.c: check if file exists after checkout lars.schneider
2017-10-05 11:23 ` Jeff King
2017-10-06 4:26 ` Junio C Hamano
2017-10-06 4:56 ` Jeff King
2017-10-06 6:03 ` Junio C Hamano
2017-10-06 6:05 ` Jeff King
2017-10-06 7:58 ` Junio C Hamano
2017-10-08 21:41 ` Lars Schneider
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=xmqq376rswh1.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=larsxschneider@gmail.com \
--cc=peff@peff.net \
--cc=t.gummerer@gmail.com \
/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).