strbuf_getwholeline: avoid calling strbuf_grow

As with the recent speedup to strbuf_addch, we can avoid calling strbuf_grow() in a tight loop of single-character adds by instead checking strbuf_avail. Note that we would instead call strbuf_addch directly here, but it does more work than necessary: it will NUL-terminate the result for each character read. Instead, in this loop we read the characters one by one and then add the terminator manually at the end. Running "git rev-parse refs/heads/does-not-exist" on a repo with an extremely large (1.6GB) packed-refs file went from (best-of-5): real 0m10.948s user 0m10.548s sys 0m0.412s to: real 0m8.601s user 0m8.084s sys 0m0.524s for a wall-clock speedup of 21%. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Apr 16, 2015 at 04:58 UTC f80c153bea4e0ea86f5b6d32e77df0b69501ee18
1 file changed +2 -1
strbuf.c
+2 -1
@@ -445,7 +445,8 @@ int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term)
445 strbuf_reset(sb);
446 flockfile(fp);
447 while ((ch = getc_unlocked(fp)) != EOF) {
448 - strbuf_grow(sb, 1);
448 + if (!strbuf_avail(sb))
449 + strbuf_grow(sb, 1);
450 sb->buf[sb->len++] = ch;
451 if (ch == term)
452 break;