From: "René Scharfe" <l.s.r@web.de>
To: Kevin Willford <kcwillford@gmail.com>, git@vger.kernel.org
Cc: peff@peff.net, gitster@pobox.com, peartben@gmail.com,
Kevin Willford <kewillf@microsoft.com>
Subject: Re: [PATCH] cache-tree: remove use of strbuf_addf in update_one
Date: Fri, 11 Aug 2017 15:08:21 +0200 [thread overview]
Message-ID: <bc8f198c-3fe2-035a-4408-6369f34023e9@web.de> (raw)
In-Reply-To: <20170810184723.12424-1-kewillf@microsoft.com>
Am 10.08.2017 um 20:47 schrieb Kevin Willford:
> String formatting can be a performance issue when there are
> hundreds of thousands of trees.
>
> Change to stop using the strbuf_addf and just add the strings
> or characters individually.
>
> There are a limited number of modes so added a switch for the
> known ones and a default case if something comes through that
> are not a known one for git.
>
> Signed-off-by: Kevin Willford <kewillf@microsoft.com>
> ---
> cache-tree.c | 24 +++++++++++++++++++++++-
> 1 file changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/cache-tree.c b/cache-tree.c
> index 2440d1dc89..41744b3db7 100644
> --- a/cache-tree.c
> +++ b/cache-tree.c
> @@ -390,7 +390,29 @@ static int update_one(struct cache_tree *it,
> continue;
>
> strbuf_grow(&buffer, entlen + 100);
> - strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
> +
> + switch (mode) {
> + case 0100644:
> + strbuf_add(&buffer, "100644 ", 7);
> + break;
> + case 0100664:
> + strbuf_add(&buffer, "100664 ", 7);
> + break;
> + case 0100755:
> + strbuf_add(&buffer, "100755 ", 7);
> + break;
> + case 0120000:
> + strbuf_add(&buffer, "120000 ", 7);
> + break;
> + case 0160000:
> + strbuf_add(&buffer, "160000 ", 7);
> + break;
You can avoid specifying the string length by using strbuf_addstr. The
compiler can determine that value; the resulting object code should be
the same with -O2.
> + default:
> + strbuf_addf(&buffer, "%o ", mode);
> + break;
> + }
> + strbuf_add(&buffer, path + baselen, entlen);
> + strbuf_addch(&buffer, '\0');
How much of the performance improvement is due to these two (especially
%.*s)? Looking forward to the perf script to find out myself. :)
> strbuf_add(&buffer, sha1, 20);
>
> #if DEBUG
>
prev parent reply other threads:[~2017-08-11 13:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-10 18:47 [PATCH] cache-tree: remove use of strbuf_addf in update_one Kevin Willford
2017-08-10 18:58 ` Stefan Beller
2017-08-10 19:03 ` Jeff King
2017-08-10 19:57 ` Kevin Willford
2017-08-10 20:33 ` Stefan Beller
2017-08-14 18:51 ` Junio C Hamano
2017-08-11 13:08 ` René Scharfe [this message]
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=bc8f198c-3fe2-035a-4408-6369f34023e9@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kcwillford@gmail.com \
--cc=kewillf@microsoft.com \
--cc=peartben@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.
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).