git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 2/2] sha1_file: improve sha1_file_name() perfs

From
Christian Couder <christian.couder@gmail.com>
Date
Jan 17, 2018, 21:44 UTC
Message-ID
<CAP8UFD16OLcmATtr8wg7KcnyUJJLYv5+8n+ygSZEOUbHMTgopQ@mail.gmail.com>
In-Reply-To
<3cbace45-61df-3074-a48c-66c68c96d542@jeffhostetler.com>
On Wed, Jan 17, 2018 at 9:37 PM, Jeff Hostetler <git@jeffhostetler.com> wrote:
Show 31 quoted lines
>
>
> On 1/17/2018 12:54 PM, Christian Couder wrote:
>>
>> As sha1_file_name() could be performance sensitive, let's
>> try to make it faster by seeding the initial buffer size
>> to avoid any need to realloc and by using strbuf_addstr()
>> and strbuf_addc() instead of strbuf_addf().
>>
>> Helped-by: Derrick Stolee <stolee@gmail.com>
>> Helped-by: Jeff Hostetler <git@jeffhostetler.com>
>> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
>> ---
>>   sha1_file.c | 8 +++++++-
>>   1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/sha1_file.c b/sha1_file.c
>> index f66c21b2da..1a94716962 100644
>> --- a/sha1_file.c
>> +++ b/sha1_file.c
>> @@ -323,8 +323,14 @@ static void fill_sha1_path(struct strbuf *buf, const
>> unsigned char *sha1)
>>     void sha1_file_name(struct strbuf *buf, const unsigned char *sha1)
>>   {
>> -       strbuf_addf(buf, "%s/", get_object_directory());
>> +       const char *obj_dir = get_object_directory();
>> +       size_t extra = strlen(obj_dir) + 1 + GIT_MAX_HEXSZ;
>
> Very minor nit.  Should this be "+3" rather than "+1"?
> One for the slash after obj_dir, one for the slash between
> "xx/y[38]", and one for the trailing NUL.

I think the trailing NUL is handled by strbuf_grow(), but I forgot about the / between "xx/y[38]", so I think it should be "+2" .

Anyway I agree with Junio that using strbuf_grow() is not really needed.
Show 7 quoted lines
>>   +     if (extra > strbuf_avail(buf))
>> +               strbuf_grow(buf, extra);
>> +
>> +       strbuf_addstr(buf, obj_dir);
>> +       strbuf_addch(buf, '/');
>>         fill_sha1_path(buf, sha1);
>>   }
Previous: Jeff King
Message 6 of 6 in “sha1_file: remove static strbuf from sha1_file_name()”
  1. 1/2 sha1_file: remove static strbuf from sha1_file_name()Christian Couder, Jan 17, 2018
  2. 2/2 sha1_file: improve sha1_file_name() perfsChristian Couder, Jan 17, 2018
  3. Jeff HostetlerJan 17, 2018
  4. Junio C HamanoJan 17, 2018
  5. Jeff KingJan 17, 2018
  6. Christian CouderJan 17, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.