From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "René Scharfe" <l.s.r@web.de>
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH] mingw: handle writes to non-blocking pipe
Date: Wed, 10 Aug 2022 11:07:26 +0200 (CEST) [thread overview]
Message-ID: <1739sr2q-71p7-q601-2022-ps56r12pos50@tzk.qr> (raw)
In-Reply-To: <72d007c5-9429-1612-24d7-af5db906dd63@web.de>
[-- Attachment #1: Type: text/plain, Size: 2599 bytes --]
Hi René,
On Wed, 10 Aug 2022, René Scharfe wrote:
> write() on Windows reports ENOSPC when writing to a non-blocking pipe
> whose buffer is full and rejects writes bigger than the buffer outright.
> Change the error code to EAGAIN and try a buffer-sized partial write to
> comply with POSIX and the expections of our Git-internal callers.
Excellent analysis, thank you!
However, let's reword this to clarify that the error code is set to EAGAIN
only if the buffer-sized partial write fails.
>
> Helped-by: Jeff King <peff@peff.net>
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
> compat/mingw.c | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/compat/mingw.c b/compat/mingw.c
> index b5502997e2..c6f244c0fe 100644
> --- a/compat/mingw.c
> +++ b/compat/mingw.c
> @@ -689,6 +689,8 @@ int mingw_fflush(FILE *stream)
> return ret;
> }
>
> +#define PIPE_BUFFER_SIZE (8192)
This constant hails all the way back from 897bb8cb2c2 (Windows: A pipe()
replacement whose ends are not inherited to children., 2007-12-07), in
case anyone wondered like I did where that number came from (and why it is
so low).
It is outside the purview of this patch to change that constant, therefore
I am fine with leaving this as-is.
> +
> #undef write
> ssize_t mingw_write(int fd, const void *buf, size_t len)
> {
> @@ -702,6 +704,21 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
> else
> errno = EINVAL;
> }
> + if (result < 0 && errno == ENOSPC) {
It might make the code clearer to turn this into an `else if`.
> + /* check if fd is a non-blocking pipe */
> + HANDLE h = (HANDLE) _get_osfhandle(fd);
> + DWORD s;
> + if (GetFileType(h) == FILE_TYPE_PIPE &&
> + GetNamedPipeHandleState(h, &s, NULL, NULL, NULL, NULL, 0) &&
> + (s & PIPE_NOWAIT)) {
> + DWORD obuflen;
> + if (!GetNamedPipeInfo(h, NULL, &obuflen, NULL, NULL))
> + obuflen = PIPE_BUFFER_SIZE;
> + if (len > obuflen)
> + return mingw_write(fd, buf, obuflen);
It is probably easier to reason about to recurse instead of using a `goto`
here.
Thank you for this patch!
Dscho
> + errno = EAGAIN;
> + }
> + }
>
> return result;
> }
> @@ -1079,7 +1096,7 @@ int pipe(int filedes[2])
> HANDLE h[2];
>
> /* this creates non-inheritable handles */
> - if (!CreatePipe(&h[0], &h[1], NULL, 8192)) {
> + if (!CreatePipe(&h[0], &h[1], NULL, PIPE_BUFFER_SIZE)) {
> errno = err_win_to_posix(GetLastError());
> return -1;
> }
> --
> 2.37.1.windows.1
>
next prev parent reply other threads:[~2022-08-10 9:07 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-02 4:13 [RFC/PATCH] pipe_command(): mark stdin descriptor as non-blocking Jeff King
2022-08-02 15:04 ` Junio C Hamano
2022-08-02 15:39 ` Jeff King
2022-08-02 16:16 ` Junio C Hamano
2022-08-03 3:53 ` [PATCH v2] " Jeff King
2022-08-03 16:45 ` René Scharfe
2022-08-03 17:20 ` Jeff King
2022-08-03 21:56 ` René Scharfe
2022-08-05 15:36 ` Jeff King
2022-08-05 21:13 ` René Scharfe
2022-08-07 10:15 ` René Scharfe
2022-08-07 17:41 ` Jeff King
2022-08-10 5:39 ` René Scharfe
2022-08-10 19:53 ` Jeff King
2022-08-10 22:35 ` René Scharfe
2022-08-11 8:52 ` Jeff King
2022-08-10 5:39 ` [PATCH] mingw: handle writes to non-blocking pipe René Scharfe
2022-08-10 9:07 ` Johannes Schindelin [this message]
2022-08-10 20:02 ` Jeff King
2022-08-10 22:34 ` René Scharfe
2022-08-11 8:47 ` Jeff King
2022-08-11 17:35 ` René Scharfe
2022-08-11 18:20 ` Jeff King
2022-08-14 15:37 ` René Scharfe
2022-08-17 5:39 ` Jeff King
2022-08-17 6:04 ` [PATCH v2 0/6] fix pipe_command() deadlock Jeff King
2022-08-17 6:04 ` [PATCH v2 1/6] compat: add function to enable nonblocking pipes Jeff King
2022-08-17 20:23 ` Junio C Hamano
2022-08-18 5:41 ` Jeff King
2022-08-17 6:05 ` [PATCH v2 2/6] nonblock: support Windows Jeff King
2022-08-17 6:06 ` [PATCH v2 3/6] git-compat-util: make MAX_IO_SIZE define globally available Jeff King
2022-08-17 6:08 ` [PATCH v2 4/6] pipe_command(): avoid xwrite() for writing to pipe Jeff King
2022-08-17 6:09 ` [PATCH v2 5/6] pipe_command(): handle ENOSPC when writing to a pipe Jeff King
2022-08-17 18:57 ` Junio C Hamano
2022-08-18 5:38 ` Jeff King
2022-08-17 6:10 ` [PATCH v2 6/6] pipe_command(): mark stdin descriptor as non-blocking Jeff King
2022-08-17 6:20 ` [PATCH v2 0/6] fix pipe_command() deadlock Jeff King
2022-08-19 21:19 ` René Scharfe
2022-08-20 7:04 ` Jeff King
2022-08-07 10:14 ` [PATCH v2] pipe_command(): mark stdin descriptor as non-blocking René Scharfe
2022-08-08 12:55 ` Johannes Schindelin
2022-08-08 12:59 ` Johannes Schindelin
2022-08-09 13:04 ` Jeff King
2022-08-09 22:10 ` Johannes Schindelin
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=1739sr2q-71p7-q601-2022-ps56r12pos50@tzk.qr \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--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).