From: "阿德烈 via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>, "Junio C Hamano" <gitster@pobox.com>,
阿德烈 <adlternative@gmail.com>,
"ZheNing Hu" <adlternative@gmail.com>
Subject: [PATCH] strbuf.c: optimize program logic
Date: Tue, 26 Jan 2021 05:06:22 +0000 [thread overview]
Message-ID: <pull.846.git.1611637582625.gitgitgadget@gmail.com> (raw)
From: ZheNing Hu <adlternative@gmail.com>
the usage in strbuf.h tell us"Alloc is somehow a
"private" member that should not be messed with.
use `strbuf_avail()`instead."
I notice that `strbuf_read` and `strbuf_read_once` may
use "sb->alloc - sb->len - 1" instead of using
`strbuf_avail()`,so I change it,in the same time,
I change `sb->len+= got` to `strbuf_setlen()`,it may
better to use existing api.
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
---
strbuf.c: optimize program logic
use strbuf_avail() is better than use Exposed .len and .alloc use
strbuf_setlen() is better than use Exposed .len,so i change them in
"strbuf.c".
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-846%2Fadlternative%2Fstrbuf_read_optimization-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-846/adlternative/strbuf_read_optimization-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/846
strbuf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/strbuf.c b/strbuf.c
index e3397cc4c72..76f560a28d0 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -517,7 +517,7 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
strbuf_grow(sb, hint ? hint : 8192);
for (;;) {
- ssize_t want = sb->alloc - sb->len - 1;
+ ssize_t want = strbuf_avail(sb);
ssize_t got = read_in_full(fd, sb->buf + sb->len, want);
if (got < 0) {
@@ -527,7 +527,7 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
strbuf_setlen(sb, oldlen);
return -1;
}
- sb->len += got;
+ strbuf_setlen(sb, sb->len + got);
if (got < want)
break;
strbuf_grow(sb, 8192);
@@ -543,7 +543,7 @@ ssize_t strbuf_read_once(struct strbuf *sb, int fd, size_t hint)
ssize_t cnt;
strbuf_grow(sb, hint ? hint : 8192);
- cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1);
+ cnt = xread(fd, sb->buf + sb->len, strbuf_avail(sb));
if (cnt > 0)
strbuf_setlen(sb, sb->len + cnt);
else if (oldalloc == 0)
base-commit: 6d3ef5b467eccd2769f1aa1c555d317d3c8dc707
--
gitgitgadget
next reply other threads:[~2021-01-26 22:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 5:06 阿德烈 via GitGitGadget [this message]
2021-01-26 6:17 ` [PATCH] strbuf.c: optimize program logic Junio C Hamano
2021-01-26 10:44 ` 胡哲宁
2021-01-26 18:47 ` Junio C Hamano
2021-01-26 18:23 ` Jeff King
2021-01-26 20:15 ` Junio C Hamano
2021-01-29 6:09 ` 胡哲宁
2021-01-30 8:50 ` Jeff King
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=pull.846.git.1611637582625.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=adlternative@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).