From: Junio C Hamano <gitster@pobox.com>
To: Git List <git@vger.kernel.org>
Cc: rsbecker@nexbridge.com, Jeff King <peff@peff.net>
Subject: [PATCH] test-genzeros: avoid raw write(2)
Date: Wed, 15 Feb 2023 18:56:14 -0800 [thread overview]
Message-ID: <xmqqo7putj1t.fsf_-_@gitster.g> (raw)
In-Reply-To: <xmqqwn4itmb1.fsf@gitster.g> (Junio C. Hamano's message of "Wed, 15 Feb 2023 17:45:54 -0800")
This test helper feeds 256kB of data at once to a single invocation
of the write(2) system call, which may be too much for some
platforms.
Call our xwrite() wrapper that knows to honor MAX_IO_SIZE limit and
cope with short writes due to EINTR instead, and die a bit more
loudly by calling die_errno() when xwrite() indicates an error.
Reported-by: Randall S. Becker <rsbecker@nexbridge.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Junio C Hamano <gitster@pobox.com> writes:
> Jeff King <peff@peff.net> writes:
>
>> So yeah, this seems like an obvious good fix. Using write_or_die() might
>> be even better, as it would report errors rather than quietly returning
>> non-zero.
>
> Maybe. Let me cook up a version with a proposed log message.
I ended up avoiding write_or_die() primarily because there is
nothing "Git" about this helper, which is a poor-man's emulation
of "dd if=/dev/zero". It felt a bit too much to pull cache.h in
as dependency for it.
t/helper/test-genzeros.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/t/helper/test-genzeros.c b/t/helper/test-genzeros.c
index 8ca988d621..47af843b68 100644
--- a/t/helper/test-genzeros.c
+++ b/t/helper/test-genzeros.c
@@ -17,15 +17,16 @@ int cmd__genzeros(int argc, const char **argv)
/* Writing out individual NUL bytes is slow... */
while (count < 0)
- if (write(1, zeros, ARRAY_SIZE(zeros)) < 0)
- return -1;
+ if (xwrite(1, zeros, ARRAY_SIZE(zeros)) < 0)
+ die_errno("write error");
while (count > 0) {
- n = write(1, zeros, count < ARRAY_SIZE(zeros) ?
- count : ARRAY_SIZE(zeros));
+ n = xwrite(1, zeros,
+ count < ARRAY_SIZE(zeros)
+ ? count : ARRAY_SIZE(zeros));
if (n < 0)
- return -1;
+ die_errno("write error");
count -= n;
}
--
2.39.2-501-gd9d677b2d8
next prev parent reply other threads:[~2023-02-16 2:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 17:44 [Bug] Test 1450.91 Fails on NonStop rsbecker
2023-02-15 17:59 ` rsbecker
2023-02-15 18:02 ` Jeff King
2023-02-15 18:49 ` rsbecker
2023-02-15 19:10 ` Junio C Hamano
2023-02-15 19:41 ` rsbecker
2023-02-15 19:59 ` Jeff King
2023-02-16 1:45 ` Junio C Hamano
2023-02-16 2:56 ` Junio C Hamano [this message]
2023-02-16 4:34 ` [PATCH] test-genzeros: avoid raw write(2) Jeff King
2023-02-16 16:09 ` Junio C Hamano
2023-02-16 16:14 ` rsbecker
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=xmqqo7putj1t.fsf_-_@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=rsbecker@nexbridge.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).